Improve CMake

ecmwf · Dec 6, 2024 · 0108923 · 0108923
2 parents 0dfcf3d + a622bbf
commit 0108923
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 57 deletions.
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -131,11 +131,11 @@ endif()
 if ( ENABLE_STATIC_BOOST_LIBS )
   set(Boost_USE_STATIC_LIBS ON)
   set(BOOST_TEST_DYN_LINK "")
-  ecbuild_info( "Using STATIC boost libraries : ${BOOST_TEST_DYN_LINK}" )
+  ecbuild_info( "Using STATIC boost libraries" )
 else()
   set(Boost_USE_STATIC_LIBS OFF)
   set(BOOST_TEST_DYN_LINK "BOOST_TEST_DYN_LINK")
-  ecbuild_info( "Using SHARED boost libraries : ${BOOST_TEST_DYN_LINK}" )
+  ecbuild_info( "Using SHARED boost libraries : (i.e. defining ${BOOST_TEST_DYN_LINK})" )
 endif()
 
 set(Boost_USE_MULTITHREADED    ON)

diff --git a/libs/pyext/.gitignore b/libs/pyext/.gitignore
@@ -1,3 +1,4 @@
 /build
 /setup.py
 /timestamp
+/ecflow/__init__.py
diff --git a/libs/pyext/CMakeLists.txt b/libs/pyext/CMakeLists.txt
@@ -83,40 +83,40 @@ set(srcs
 # tests
 # =====================================================================
 set(u_tests
-  py_u_test_add
-  py_u_test_collection
-  py_u_test_cron
-  py_u_test_defs_constructor
-  py_u_test_get_attr
-  py_u_test_manual
-  py_u_test_node
-  py_u_test_late
-  py_u_test_replace_node
-  py_u_test_tutorial
-  py_u_TestAddDelete
-  py_u_TestAddDeleteFunc
-  py_u_TestAddNodeFunc
-  py_u_TestAutoAddExtern
-  py_u_TestAviso
-  py_u_TestCopy
-  py_u_TestDefs
-  py_u_TestDefsCheck
-  py_u_TestDerivable
-  py_u_TestEcf
-  py_u_TestError
-  py_u_TestFind
-  py_u_TestFlag
-  py_u_TestGetAllTasks
-  py_u_TestJobGeneration
-  py_u_TestMirror
-  py_u_TestParent
-  py_u_TestRemove
-  py_u_TestRepeatArithmetic
-  py_u_TestSimulator
-  py_u_TestTraversal
-  py_u_TestUserManual
-  py_u_TestWith
-  py_u_sort
+  u_test_add
+  u_test_collection
+  u_test_cron
+  u_test_defs_constructor
+  u_test_get_attr
+  u_test_manual
+  u_test_node
+  u_test_late
+  u_test_replace_node
+  u_test_tutorial
+  u_TestAddDelete
+  u_TestAddDeleteFunc
+  u_TestAddNodeFunc
+  u_TestAutoAddExtern
+  u_TestAviso
+  u_TestCopy
+  u_TestDefs
+  u_TestDefsCheck
+  u_TestDerivable
+  u_TestEcf
+  u_TestError
+  u_TestFind
+  u_TestFlag
+  u_TestGetAllTasks
+  u_TestJobGeneration
+  u_TestMirror
+  u_TestParent
+  u_TestRemove
+  u_TestRepeatArithmetic
+  u_TestSimulator
+  u_TestTraversal
+  u_TestUserManual
+  u_TestWith
+  u_sort
 )
 
 set(s_tests

diff --git a/libs/pyext/ecflow/__init__.py b/libs/pyext/ecflow/__init__.py
diff --git a/libs/pyext/python3/CMakeLists.txt b/libs/pyext/python3/CMakeLists.txt
@@ -68,7 +68,7 @@ foreach( test ${u_tests} )
       python nightly
     TYPE PYTHON
     ARGS
-      ${CMAKE_CURRENT_SOURCE_DIR}/../test/${test}.py
+      ${CMAKE_CURRENT_SOURCE_DIR}/../test/py_${test}.py
     ENVIRONMENT
       "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
     TEST_DEPENDS