review cmake tests

Author: lettleli

CMakeLists.txt

@@ -8,36 +8,39 @@
 #
 # the config file is generatet in the build and install directories
 
-cmake_minimum_required(VERSION 3.10...3.13)
+cmake_minimum_required(VERSION 3.10...3.15)
 project(PENF VERSION 1.2.1 LANGUAGES Fortran)
 
 # seach path for additional cmake modules
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/Modules)
 
-
 # set export variables needed for building
 set(TARGETS_EXPORT_NAME "${PROJECT_NAME}-targets")
 set(NAMESPACE "${PROJECT_NAME}::")
 
-
 # generate the library and install instructions
 add_subdirectory(src/lib)
 
 # testing
 if(${PROJECT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
     set(main_project TRUE)
+    enable_testing()
+    option(BUILD_TESTING "Build the testing tree." ON)
+    #include(CTest)
 else()
     set(main_project FALSE)
-endif()
 
-include(CMakeDependentOption)
-cmake_dependent_option(BUILD_TESTING_${PROJECT_NAME}
-     "Build the testing tree for project ${PROJECT_NAME}." OFF
-     "BUILD_TESTING;NOT main_project" OFF
-)
+    # if this is not the main project but BUILD_TESTIG is set to TRUE
+    # the tests for this project can be enabled by also setting
+    # BUILD_TESTING_${PROJECT_NAME} to TRUE
+    include(CMakeDependentOption)
+    cmake_dependent_option(BUILD_TESTING_${PROJECT_NAME}
+        "Build the testing tree for project ${PROJECT_NAME}." OFF
+        "BUILD_TESTING;NOT main_project" OFF
+    )
+endif()
 
-if((main_project AND BUILD_TESTING) OR BUILD_TESTING_${PROJECT_NAME})
-    enable_testing()
+if((main_project OR BUILD_TESTING_${PROJECT_NAME}) AND BUILD_TESTING)
     add_subdirectory(src/tests)
 endif()
 

src/tests/CMakeLists.txt

@@ -7,12 +7,17 @@ function(add_penf_doctest test_src libraries)
     get_filename_component(test_dir ${test_src} DIRECTORY)
     set(result_src "${test_dir}/${test_name}.result")
 
-    add_executable(${test_name} ${test_src})
+    add_executable(${test_name} ${test_src}) # EXCLUDE_FROM_ALL ${test_src})
     foreach(lib IN LISTS libraries)
         target_link_libraries(${test_name} ${lib})
     endforeach()
     add_test(NAME ${test_name} COMMAND ${test_name})
 
+    # # if excluding the tests from the ALL target, build them when running the tests
+    # add_test(${test_name}_build "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --config $<CONFIG> --target ${test_name})
+    # set_tests_properties(${test_name}_build PROPERTIES FIXTURES_SETUP    ${test_name}_fixture)
+    # set_tests_properties(${test_name}       PROPERTIES FIXTURES_REQUIRED ${test_name}_fixture)
+
     file(STRINGS ${result_src} result_raw)
     string(REGEX REPLACE "([+.])([^+.]*)" "\\\\\\1\\2" result ${result_raw})