diff --git a/.gitignore b/.gitignore index 5b861d3..0d45a24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build .vs .cache -cmake-* \ No newline at end of file +cmake-* +.DS_Store \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 2a48940..8e8ad70 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "files.autoSave": "onFocusChange", - "editor.fontSize": 14, - "editor.fontFamily": "'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono'", + //"editor.fontSize": 14, + //"editor.fontFamily": "'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono', 'FiraCode Nerd Font Mono'", "cmake.configureOnOpen": true, "cmake.debugConfig": { "console": "integratedTerminal", diff --git a/CMakeLists.txt b/CMakeLists.txt index 441d600..bedd0a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,8 @@ set(SOURCES_FILE resource.h resource.cpp ) +# 默认可以从环境中获取boost +cmake_policy(SET CMP0167 NEW) set(Boost_USE_STATIC_LIBS OFF) find_package(Boost REQUIRED program_options filesystem) include_directories(${Boost_INCLUDE_DIR})