From 91bf7f21a7293e2c3827499373d687af4f60d566 Mon Sep 17 00:00:00 2001 From: Kong Date: Sat, 3 Feb 2024 00:04:07 +0800 Subject: [PATCH] Update ConanHandle.cmake --- README.md | 2 +- cmake/ConanHandle.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b22800b..e625a64 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Automatically copies the dynamic library (`.dll`) from `conan` to the same direc ### NOTICE - Put `VcpkgHandle.cmake` **before** `project()`. -- Put `ConanHandle.cmake` **after** `project()`. +- Put `ConanHandle.cmake` **after** `set(CMAKE_CXX_STANDARD )`. - `VcpkgHandle.cmake` is paired with `vcpkg.json`. - `ConanHandle.cmake` is paired with `conanfile.txt`. diff --git a/cmake/ConanHandle.cmake b/cmake/ConanHandle.cmake index 1cdce58..e841c1a 100644 --- a/cmake/ConanHandle.cmake +++ b/cmake/ConanHandle.cmake @@ -20,6 +20,7 @@ execute_process( COMMAND ${_CONAN_EXEC} "install" "${CMAKE_CURRENT_SOURCE_DIR}" "--output-folder=${_CONAN_BUILD_ROOT_PATH}" "--build=missing" "--settings:host=build_type=${CMAKE_BUILD_TYPE}" - "--settings:build=build_type=${CMAKE_BUILD_TYPE}" COMMAND_ERROR_IS_FATAL LAST + "--settings:host=compiler.cppstd=${CMAKE_CXX_STANDARD}" "--settings:build=build_type=${CMAKE_BUILD_TYPE}" + "--settings:build=compiler.cppstd=${CMAKE_CXX_STANDARD}" COMMAND_ERROR_IS_FATAL LAST ) list(APPEND CMAKE_PREFIX_PATH "${_CONAN_BUILD_ROOT_PATH}")