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

Switch over fully to modern CMake targets and updates for testing against Trilinos (#299) #479

Merged
merged 35 commits into from
Jun 8, 2022
Merged

Switch over fully to modern CMake targets and updates for testing against Trilinos (#299) #479

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
21c919f
Fix some typos in comments
bartlettroscoe May 26, 2022
a99bf60
Fix the comment line for a test block
bartlettroscoe May 26, 2022
d9646f0
Standardize comments (#299)
bartlettroscoe May 3, 2022
a7c2282
Add "" initializers for several vars (#299)
bartlettroscoe May 3, 2022
e8bb3d7
Snapshot FindTPLNetcdf.cmake from Trilinos 8c1028df724 with small mod…
bartlettroscoe May 18, 2022
bed095e
Switch to relying on TRIBITS_TESTONLY_LIB property only (#299)
bartlettroscoe May 4, 2022
ca3f5e3
Switch to linking against <Package>::all_libs (#299)
bartlettroscoe May 3, 2022
969abad
WIP: Comment out old TriBITS manual manipulation of includes and libs…
bartlettroscoe May 3, 2022
2e51918
Factor out new module TribitsConfigureFile.cmake (#63, #299)
bartlettroscoe May 5, 2022
31fbaea
WIP: Remove old TriBITS manual manipulation of includes and libs (#299)
bartlettroscoe May 5, 2022
ed1597c
Factor out TribitsAddLibrary.cmake for tribits_add_library() (#299)
bartlettroscoe May 5, 2022
5011e8b
tribits_add_library(): Factor out functions and some cleanup (#299)
bartlettroscoe May 6, 2022
81f7f44
Add test for ADD_DIR_TO_NAME (#299)
bartlettroscoe May 13, 2022
f4752b3
Rename local var to test tribits_create_name_from_current_source_dire…
bartlettroscoe May 13, 2022
d7a81de
Fix return arg in tribits_create_name_from_current_source_directory()…
bartlettroscoe May 13, 2022
24a2a8e
tribits_add_executable(): Factor out functions and cleanup (#299)
bartlettroscoe May 6, 2022
dcb616f
Remove comments about being hard to maintain (#299)
bartlettroscoe May 7, 2022
cb6bdbd
Remove all obsolete doc references to include dirs and lib dirs (#299)
bartlettroscoe May 7, 2022
d430376
TribitsExampleProject2: Remove hacked dependencies on indirect TPLs (…
bartlettroscoe May 13, 2022
7ef19a1
Update changelog for final switch to modern CMake targets (#299)
bartlettroscoe May 13, 2022
6ddc67a
Add changelog note about no longer setting dir property INCLUDE_DIREC…
bartlettroscoe May 17, 2022
a9cdb79
Add changelog note for setting <Package>_ENABLE_<depPkg> for required…
bartlettroscoe May 17, 2022
b1895f7
Handle <Project>_EXTRA_LINK_FLAGS as extra TPL that everything depend…
bartlettroscoe May 26, 2022
a168af1
Add back include_guard(GLOBAL) (#299)
bartlettroscoe May 27, 2022
618284a
WIP: Set <Project>_INCLUDE_DIRS in <Project>Config.cmake for the inst…
bartlettroscoe May 27, 2022
ebe89e3
Add test for TribitsExampleApp with MPI enabled (#299)
bartlettroscoe May 27, 2022
e2dbc66
WIP: Make SimpleCxx package dependent on MPI (#299)
bartlettroscoe May 28, 2022
a831472
Fix tests for adding MPI to SimpleCxx and adding back install include…
bartlettroscoe May 28, 2022
4051847
WIP: Add test to expose defect with MPI::all_libs (#299)
bartlettroscoe May 28, 2022
9206994
Have TPL MPI produce MPI::all_libs and MPIConfig.cmake (#299)
bartlettroscoe May 27, 2022
700f916
Remove worthless `if (TARGET <Pkg>::all_libs)` checks (#299)
bartlettroscoe May 28, 2022
4a2ecc0
Merge remote-tracking branch 'github/master' into 299-switch-to-moder…
bartlettroscoe Jun 8, 2022
f240850
Exclude MPI tests when MPI not available (#299)
bartlettroscoe Jun 8, 2022
4758901
Only link to <Package>_TEST_ENABLED_DEPENDENCIES for TESTONLY libs (#…
bartlettroscoe Jun 8, 2022
21d3c4b
Fuse foreach() loops for LIB and TEST dependencies (#299)
bartlettroscoe Jun 8, 2022
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
2 changes: 1 addition & 1 deletion test/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ tribits_add_advanced_test( TestingFunctionMacro_UnitTests
-D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TestingFunctionMacro_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 695"
"Final UnitTests Result: num_run = 696"
"Final UnitTests Result: PASSED"
)

Expand Down
19 changes: 18 additions & 1 deletion test/core/TestingFunctionMacro_UnitTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,23 @@ function(unittest_tribits_add_test_basic)
"NAME;${PACKEXEN};COMMAND;/some/abs/path/${PACKEXEN}.exe;arg1"
)


#
# ADD_DIR_TO_NAME
#

message("Add a test with ADD_DIR_TO_NAME")
set(PACKAGE_SOURCE_DIR "/base/project/package/mypackage")
set(CMAKE_CURRENT_SOURCE_DIR "/base/project/package/mypackage/tests/unit-tests/test1")
global_set(TRIBITS_ADD_TEST_ADD_TEST_INPUT)
tribits_add_test( ${EXEN} ADD_DIR_TO_NAME ARGS arg1 )
unittest_compare_const(
TRIBITS_ADD_TEST_ADD_TEST_INPUT
"NAME;${PACKAGE_NAME}_tests_unit-tests_test1_${EXEN};COMMAND;${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_tests_unit-tests_test1_${EXEN}.exe;arg1"
)
unset(PACKAGE_SOURCE_DIR)
unset(CMAKE_CURRENT_SOURCE_DIR)

#
# <fullTestName>_EXTRA_ARGS
#
Expand Down Expand Up @@ -4555,4 +4572,4 @@ message("*** Determine final result of all unit tests")
message("***\n")

# Pass in the number of expected tests that must pass!
unittest_final_result(695)
unittest_final_result(696)