roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-cmake: bugfix: tolerate empty CMAKE_BUILD_TYPE

Browse source
This commit is contained in:
Roland Conybeare 2024-05-01 14:46:56 -04:00
commit c656d0d4f5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmake/xo_macros/xo_cxx.cmake
View file

@ -38,7 +38,7 @@ endmacro()
# debug build (cmake -DCMAKE_BUILD_TYPE=debug path/to/source) # debug build (cmake -DCMAKE_BUILD_TYPE=debug path/to/source)
# #
macro(xo_toplevel_debug_config2) macro(xo_toplevel_debug_config2)
if (${CMAKE_BUILD_TYPE} STREQUAL "debug") if ("${CMAKE_BUILD_TYPE}" STREQUAL "debug")
# clear out hardwired default. # clear out hardwired default.
# we want to override project-level defaults, # we want to override project-level defaults,
# but need to prevent interference from hardwired defaults # but need to prevent interference from hardwired defaults
@ -57,9 +57,8 @@ macro(xo_toplevel_debug_config2)
set(PROJECT_CXX_FLAGS_DEBUG ${PROJECT_CXX_FLAGS} -ggdb -Og set(PROJECT_CXX_FLAGS_DEBUG ${PROJECT_CXX_FLAGS} -ggdb -Og
CACHE STRING "debug c++ compiler flags") CACHE STRING "debug c++ compiler flags")
endif() endif()
if (${CMAKE_BUILD_TYPE} STREQUAL debug)
message(STATUS "PROJECT_CXX_FLAGS_DEBUG: debug c++ flags are [${PROJECT_CXX_FLAGS_DEBUG}]") message(STATUS "PROJECT_CXX_FLAGS_DEBUG: debug c++ flags are [${PROJECT_CXX_FLAGS_DEBUG}]")
endif()
add_compile_options("$<$<CONFIG:DEBUG>:${PROJECT_CXX_FLAGS_DEBUG}>") add_compile_options("$<$<CONFIG:DEBUG>:${PROJECT_CXX_FLAGS_DEBUG}>")
endif() endif()
@ -77,7 +76,7 @@ endmacro()
# file:///path/to/build/ccov/html/index.html # file:///path/to/build/ccov/html/index.html
# #
macro(xo_toplevel_coverage_config2) macro(xo_toplevel_coverage_config2)
if (${CMAKE_BUILD_TYPE} STREQUAL "coverage") if ("${CMAKE_BUILD_TYPE}" STREQUAL "coverage")
#find_program(LCOV_EXECUTABLE NAMES lcov) #find_program(LCOV_EXECUTABLE NAMES lcov)
#find_program(GENHTML_EXECUTABLE NAMES genhtml) #find_program(GENHTML_EXECUTABLE NAMES genhtml)
# see bin/xo-cmake-lcov-harness in this repo # see bin/xo-cmake-lcov-harness in this repo