diff --git a/CMakeLists.txt b/CMakeLists.txt index d58cb14..5e0719f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,15 +12,13 @@ set(PACKAGE_VERSION "1.0.0") macro(build_yaml_cpp) set(extra_cmake_args) - set(YAML_C_FLAGS ${CMAKE_C_FLAGS}) - set(YAML_CXX_FLAGS ${CMAKE_CXX_FLAGS}) if(DEFINED CMAKE_BUILD_TYPE) list(APPEND extra_cmake_args -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) endif() if(NOT WIN32) - list(APPEND YAML_C_FLAGS "-w") - list(APPEND YAML_CXX_FLAGS "-std=c++14 -w") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -w") endif() list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TESTS=OFF") @@ -28,9 +26,9 @@ macro(build_yaml_cpp) list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_CONTRIB=OFF") list(APPEND extra_cmake_args "-DBUILD_SHARED_LIBS=ON") list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}") - list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS=${YAML_C_FLAGS}") + list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}") list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") - list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS=${YAML_CXX_FLAGS}") + list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}") if(WIN32 AND NOT ${CMAKE_VERBOSE_MAKEFILE}) set(should_log ON) # prevent warnings in Windows CI