diff options
| author | James <james@conan.io> | 2021-09-14 09:22:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 09:22:37 +0200 |
| commit | 5f2a6c836fc809588601d2ab5f3b4886647543da (patch) | |
| tree | 085bd88b3d5489a1fb150465f15bf84e097fd2dc | |
| parent | 8494959914c81f653d8f72939aeb766575d297b5 (diff) | |
not caching and overwriting CMAKE_XXX_INIT vars in CMakeToolchain (#9576)
| -rw-r--r-- | conan/tools/cmake/toolchain.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conan/tools/cmake/toolchain.py b/conan/tools/cmake/toolchain.py index 0c2b81b3..207ae344 100644 --- a/conan/tools/cmake/toolchain.py +++ b/conan/tools/cmake/toolchain.py @@ -469,10 +469,10 @@ class UserToolchain(Block): class CMakeFlagsInitBlock(Block): template = textwrap.dedent(""" - set(CMAKE_CXX_FLAGS_INIT "${CONAN_CXX_FLAGS}" CACHE STRING "" FORCE) - set(CMAKE_C_FLAGS_INIT "${CONAN_C_FLAGS}" CACHE STRING "" FORCE) - set(CMAKE_SHARED_LINKER_FLAGS_INIT "${CONAN_SHARED_LINKER_FLAGS}" CACHE STRING "" FORCE) - set(CMAKE_EXE_LINKER_FLAGS_INIT "${CONAN_EXE_LINKER_FLAGS}" CACHE STRING "" FORCE) + set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} ${CONAN_CXX_FLAGS}") + set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS_INIT} ${CONAN_C_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "${CMAKE_SHARED_LINKER_FLAGS_INIT} ${CONAN_SHARED_LINKER_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} ${CONAN_EXE_LINKER_FLAGS}") """) |