diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2025-02-12 16:30:38 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2025-02-12 16:30:38 -0500 |
| commit | afecc407fd0d36061169ae64164703382656cafe (patch) | |
| tree | 05753d988dbe698afd2dce1fd26eae3e2a5d9165 | |
| parent | 2bd06b22e455fa154e7db27677421c8b53cbf43c (diff) | |
| download | stasis-afecc407fd0d36061169ae64164703382656cafe.tar.gz | |
Update cmake configuration
* Pass through for CMAKE_C_FLAGS
* Rename BUILD_TESTING[_RT] to TESTS[_RT]
* Add toggle for DEBUG level messages (displayed regardless of verbosity state)
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
2 files changed, 15 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 76b7186..8f5dfa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,12 @@ if (FORTIFY_SOURCE) set(nix_cflags ${nix_cflags} -O -D_FORTIFY_SOURCE=1) endif () +# Toggle extremely verbose output +option(DEBUG_MESSAGES OFF) +if (DEBUG_MESSAGES) + set(nix_cflags ${nix_cflags} -DDEBUG) +endif() + if (CMAKE_C_COMPILER_ID STREQUAL "GNU") add_compile_options(${nix_cflags}) elseif (CMAKE_C_COMPILER_ID MATCHES "Clang") @@ -30,6 +36,7 @@ elseif (CMAKE_C_COMPILER_ID MATCHES "Clang") elseif (CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(${win_cflags}) endif() +message(CHECK_START "Compiler flags: ${nix_cflags}") set(core_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/core/include) set(delivery_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/delivery/include) @@ -38,23 +45,17 @@ configure_file(${PROJECT_SOURCE_DIR}/include/config.h.in ${CMAKE_CURRENT_BINARY_ include_directories(${PROJECT_BINARY_DIR}/include) add_subdirectory(src) -# Toggle extremely verbose output -option(BUILD_TESTING_DEBUG OFF) -if (BUILD_TESTING_DEBUG) - add_compile_options(-DDEBUG) -endif() - # Toggle regression testing on/off -option(BUILD_TESTING_RT ON) +option(TESTS_RT ON) # Toggle testing -option(BUILD_TESTING OFF) +option(TESTS OFF) message(CHECK_START "Run unit tests") -if (BUILD_TESTING) +if (TESTS) message(CHECK_PASS "yes") enable_testing() message(CHECK_START "Run regression tests") - if (BUILD_TESTING_RT) + if (TESTS_RT) message(CHECK_PASS "yes") else() message(CHECK_PASS "no") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bcc05ce..2b09e9e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,9 +1,9 @@ find_program(BASH_PROGRAM bash) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests) set(CTEST_BINARY_DIRECTORY ${PROJECT_BINARY_DIR}/tests) -set(nix_gnu_cflags -Wno-format-truncation -Wno-error -Wno-unused-parameter -Wno-unused-result -Wno-discarded-qualifiers) -set(nix_clang_cflags -Wno-format-truncation -Wno-unused-parameter -Wno-unused-result -Wno-incompatible-pointer-types-discards-qualifiers) -set(win_msvc_cflags /Wall) +set(nix_gnu_cflags ${CMAKE_C_FLAGS} -Wno-format-truncation -Wno-error -Wno-unused-parameter -Wno-unused-result -Wno-discarded-qualifiers) +set(nix_clang_cflags ${CMAKE_C_FLAGS} -Wno-format-truncation -Wno-unused-parameter -Wno-unused-result -Wno-incompatible-pointer-types-discards-qualifiers) +set(win_msvc_cflags ${CMAKE_C_FLAGS} /Wall) file(GLOB source_files "test_*.c") file(GLOB rt_files "rt_*.sh") @@ -12,7 +12,7 @@ set(ext_pattern "(^.*/|\\.[^.]*$)") file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -if (BASH_PROGRAM AND BUILD_TESTING_RT) +if (BASH_PROGRAM AND TESTS_RT) foreach(rt_file ${rt_files}) file(REAL_PATH ${rt_file} rt_name) string(REGEX REPLACE ${ext_pattern} "" rt_name ${rt_file}) |