Modernize CMakeLists.txt ECFLOW-1923

ACore/CMakeLists.txt

@@ -8,13 +8,13 @@
 # nor does it submit to any jurisdiction.
 #
 
-configure_file(ecflow_version.h.in ${CMAKE_BINARY_DIR}/generated/ecflow_version.h)
-configure_file(ecflow_source_build_dir.h.in ${CMAKE_BINARY_DIR}/generated/ecflow_source_build_dir.h)
+configure_file(src/ecflow_version.h.in ${CMAKE_BINARY_DIR}/generated/src/ecflow_version.h)
+configure_file(src/ecflow_source_build_dir.h.in ${CMAKE_BINARY_DIR}/generated/src/ecflow_source_build_dir.h)
 
 set(srcs
   # Headers
-  ${CMAKE_BINARY_DIR}/generated/ecflow_version.h
-  ${CMAKE_BINARY_DIR}/generated/ecflow_source_build_dir.h
+  ${CMAKE_BINARY_DIR}/generated/src/ecflow_version.h
+  ${CMAKE_BINARY_DIR}/generated/src/ecflow_source_build_dir.h
   src/AssertTimer.hpp
   src/Cal.hpp
   src/Calendar.hpp
@@ -101,7 +101,7 @@ ecbuild_add_library(
     ${srcs}
   PUBLIC_INCLUDES
     src
-    ${CMAKE_BINARY_DIR}/generated
+    ${CMAKE_BINARY_DIR}/generated/src
   PUBLIC_LIBS
     cereal::cereal # this needs to be public as it appears in public header files used downstream
     $<$<VERSION_LESS:${Boost_VERSION},1.69.0>:Boost::system>
@@ -151,6 +151,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     u_acore
+  LABELS
+    unit nightly
   SOURCES
     ${test_srcs}
   LIBS

ANattr/CMakeLists.txt

@@ -84,6 +84,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     u_anattr
+  LABELS
+    unit nightly
   SOURCES
     ${test_srcs}
   LIBS

ANode/CMakeLists.txt

@@ -228,6 +228,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     u_anode
+  LABELS
+    unit nightly
   SOURCES
     ${test_srcs}
   LIBS
@@ -256,6 +258,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     u_aparser
+  LABELS
+    unit nightly
   SOURCES
     ${test_srcs}
   INCLUDES
@@ -279,6 +283,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       u_anode_stest
+    LABELS
+      unit nightly
     SOURCES
       ${test_srcs}
     LIBS
@@ -304,6 +310,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       perf_aparser
+    LABELS
+      performance nightly
     SOURCES
       ${test_srcs}
     LIBS
@@ -329,6 +337,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       perf_aparser_timer
+    LABELS
+      performance nightly
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/test/data/single_defs/mega.def
     SOURCES
@@ -350,6 +360,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       perf_aparser_only
+    LABELS
+      performance
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/test/data/single_defs/mega.def
     SOURCES

Base/CMakeLists.txt

@@ -168,6 +168,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     u_base
+  LABELS
+    unit nightly
   SOURCES
     ${test_srcs}
   INCLUDES
@@ -194,6 +196,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       perf_job_gen
+    LABELS
+      performance
     SOURCES
       ${test_srcs}
     LIBS

CSim/CMakeLists.txt

@@ -59,6 +59,8 @@ set(test_srcs
 ecbuild_add_test(
   TARGET
     c_csim
+  LABELS
+    integration nightly
   SOURCES
     ${test_srcs}
   LIBS
@@ -73,6 +75,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       c_csim_single
+    LABELS
+      integration nightly
     SOURCES
       test/TestSingleSimulator.cpp
       test/TestUtil.cpp

Client/CMakeLists.txt

@@ -127,6 +127,8 @@ endif()
 ecbuild_add_test(
   TARGET
     s_client
+  LABELS
+    integration nightly
   SOURCES
     ${test_srcs}
   INCLUDES
@@ -151,6 +153,8 @@ if (ENABLE_ALL_TESTS AND ENABLE_SERVER)
   ecbuild_add_test(
     TARGET
       perf_test_large_defs
+    LABELS
+      performance
     SOURCES
       # Headers
       test/SCPort.hpp
@@ -177,6 +181,8 @@ if (ENABLE_ALL_TESTS AND ENABLE_SERVER)
   ecbuild_add_test(
     TARGET
       m_test_migration
+    LABELS
+      migration
     SOURCES
       # Headers
       test/SCPort.hpp

Http/CMakeLists.txt

@@ -110,7 +110,10 @@ if (ENABLE_HTTP AND ENABLE_SERVER)
     )
 
     ecbuild_add_test(
-      TARGET s_http
+      TARGET
+        s_http
+      LABELS
+        integration nightly
       SOURCES
         ${test_srcs}
       INCLUDES

Pyext/python2/CMakeLists.txt

@@ -55,6 +55,8 @@ foreach( test ${u_tests} )
   ecbuild_add_test(
     TARGET
       py2_${test}
+    LABELS
+      python nightly
     TYPE PYTHON
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/../test/${test}.py
@@ -72,6 +74,8 @@ if ( ENABLE_ALL_TESTS AND ENABLE_SERVER)
     ecbuild_add_test(
       TARGET
         py2_${test}
+      LABELS
+        python nightly
       TYPE PYTHON
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/../test/${test}.py

Pyext/python3/CMakeLists.txt

@@ -66,6 +66,8 @@ foreach( test ${u_tests} )
   ecbuild_add_test(
     TARGET
       py3_${test}
+    LABELS
+      python nightly
     TYPE PYTHON
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/../test/${test}.py
@@ -83,6 +85,8 @@ if ( ENABLE_ALL_TESTS AND ENABLE_SERVER)
     ecbuild_add_test(
       TARGET
         py3_${test}
+      LABELS
+        python nightly
       TYPE PYTHON
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/../test/py_${test}.py

Server/CMakeLists.txt

@@ -95,6 +95,8 @@ SET_TARGET_PROPERTIES(ecflow_server
 ecbuild_add_test(
   TARGET
     u_server
+  LABELS
+    unit nightly
   INCLUDES
     src
   SOURCES

Test/CMakeLists.txt

@@ -76,6 +76,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       s_test
+    LABELS
+      integration nightly
     SOURCES
       ${test_srcs}
     LIBS
@@ -89,6 +91,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       s_test_zombies
+    LABELS
+      integration nightly
     SOURCES
       TestZombies.cpp
     LIBS
@@ -103,6 +107,8 @@ if (ENABLE_ALL_TESTS)
   ecbuild_add_test(
     TARGET
       s_singletest
+    LABELS
+      integration nightly
     SOURCES
       TestSingle.cpp
     LIBS

Udp/CMakeLists.txt

@@ -114,8 +114,12 @@ list(APPEND ${TEST_TARGET}_srcs
 )
 
 ecbuild_add_test(
-  TARGET ${TEST_TARGET}
-  SOURCES ${${TEST_TARGET}_srcs}
+  TARGET
+    ${TEST_TARGET}
+  LABELS
+    integration nightly
+  SOURCES
+    ${${TEST_TARGET}_srcs}
   LIBS
     ${LIB_TARGET}
     libclient