Skip to content

Minor cmake cleanups. #6762

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

Merged
merged 1 commit into from
Nov 8, 2025
Merged

Minor cmake cleanups. #6762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ foreach(_test ${_tests})
set(_use_test OFF)
endif()

# Check whether the test satisfies its conditions. The following
# modifies _use_test as necessary:
SHOULD_ENABLE_TEST(${CMAKE_CURRENT_SOURCE_DIR}/${_testname}.prm)

if(_use_test)
Expand Down Expand Up @@ -235,18 +237,15 @@ foreach(_test ${_tests})
# output directory of this test. MAKE_DIRECTORY then does a `mkdir -p`.
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output-${_testname})

file(GLOB_RECURSE _outputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_testname}/
${CMAKE_CURRENT_SOURCE_DIR}/${_testname}/[a-zA-Z0-9]*)
foreach(_output ${_outputs})
file(GLOB_RECURSE _outputs
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_testname}/
${CMAKE_CURRENT_SOURCE_DIR}/${_testname}/[a-zA-Z0-9]*)

# get the directory name we should work on; for cmake <2.8.11, the
# subcommand was PATH (legacy), for everything after we can use
# DIRECTORY
if (${CMAKE_VERSION} VERSION_LESS "2.8.12")
get_filename_component(_dir ${_output} PATH)
else()
get_filename_component(_dir ${_output} DIRECTORY)
endif()
# For each of the collected output files under tests/, see if
# they have a directory component and if so, create that directory
# also in the runtime directory under the current build directory:
foreach(_output ${_outputs})
get_filename_component(_dir ${_output} DIRECTORY)
if(NOT ${_dir} STREQUAL "" )
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output-${_testname}/${_dir})
endif()
Expand Down