Skip to content

Commit

Permalink
Fix handling of CMAKE_C[XX]_FLAGS lists (#24)
Browse files Browse the repository at this point in the history
* Fix handling of CMAKE_C[XX]_FLAGS lists

Signed-off-by: Christophe Bedard <[email protected]>
  • Loading branch information
christophebedard authored Aug 5, 2021
1 parent 03a4cd7 commit a00f059
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,23 @@ 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")
list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TOOLS=OFF")
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
Expand Down

0 comments on commit a00f059

Please sign in to comment.