Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve CMake #138

Merged
merged 3 commits into from
Dec 6, 2024
Merged

Improve CMake #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d53da87
Correct the name of python tests
marcosbento Nov 29, 2024
a59ddbd
Correct the CMake configure-time output messages
marcosbento Nov 29, 2024
a622bbf
Remove and ignore generated __init__.py file
marcosbento Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions libs/pyext/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/build
/setup.py
/timestamp
/ecflow/__init__.py
68 changes: 34 additions & 34 deletions libs/pyext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions libs/pyext/ecflow/__init__.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion libs/pyext/python3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading