Merge branch 'main' into enhancement-system_sc_and_p4est_linkage_2

DLR-AMR · Sep 3, 2024 · 44277e6 · 44277e6
2 parents 6d59c9e + 6bce0b7
commit 44277e6
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 3 deletions.
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -4,10 +4,23 @@ function( add_t8_benchmark )
     set( multiValueArgs "SOURCES" )
     cmake_parse_arguments( ADD_T8_BENCHMARK "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+    # Get the path of the first file listed in the SOURCES list and use it to determine the build directory.
+    # The executable will be build in the same directory as the first source file.
+    list(GET ADD_T8_BENCHMARK_SOURCES 0 FIRST_SOURCE)
+    get_filename_component(BENCHMARK_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/${FIRST_SOURCE}" DIRECTORY)
+    file(RELATIVE_PATH BENCHMARK_RELATIVE_DIR "${CMAKE_SOURCE_DIR}" "${BENCHMARK_SOURCE_DIR}")
+    set(BENCHMARK_BUILD_DIR "${CMAKE_BINARY_DIR}/${BENCHMARK_RELATIVE_DIR}")
+
     add_executable( ${ADD_T8_BENCHMARK_NAME} ${ADD_T8_BENCHMARK_SOURCES} )
     target_link_libraries( ${ADD_T8_BENCHMARK_NAME} PRIVATE T8 ${SC_LIBRARIES} m )
     target_include_directories( ${ADD_T8_BENCHMARK_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${SC_INCLUDE_DIR})
 
+    set_target_properties(${ADD_T8_BENCHMARK_NAME} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${BENCHMARK_BUILD_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${BENCHMARK_BUILD_DIR}"
+        ARCHIVE_OUTPUT_DIRECTORY "${BENCHMARK_BUILD_DIR}"
+    )
+
     if( T8CODE_EXPORT_COMPILE_COMMANDS )
         set_target_properties( ${ADD_T8_BENCHMARK_NAME} PROPERTIES EXPORT_COMPILE_COMMANDS ON )
     endif( T8CODE_EXPORT_COMPILE_COMMANDS )

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -5,8 +5,8 @@ else()
     add_library( t8example STATIC )
 endif()
 target_sources( t8example PRIVATE common/t8_example_common.cxx common/t8_example_common_functions.cxx )
-target_include_directories( t8example PRIVATE ${CMAKE_CURRENT_LIST_DIR}/.. )
-target_link_libraries( t8example PRIVATE T8 )
+target_include_directories( t8example PRIVATE ${CMAKE_CURRENT_LIST_DIR}/.. ${SC_INCLUDE_DIR} )
+target_link_libraries( t8example PRIVATE T8 ${SC_LIBRARIES} m )
 install( TARGETS t8example DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
 
 function( add_t8_example )
@@ -15,10 +15,23 @@ function( add_t8_example )
     set( multiValueArgs "SOURCES" )
     cmake_parse_arguments( ADD_T8_EXAMPLE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+    # Get the path of the first file listed in the SOURCES list and use it to determine the build directory.
+    # The executable will be build in the same directory as the first source file.
+    list(GET ADD_T8_EXAMPLE_SOURCES 0 FIRST_SOURCE)
+    get_filename_component(EXAMPLE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/${FIRST_SOURCE}" DIRECTORY)
+    file(RELATIVE_PATH EXAMPLE_RELATIVE_DIR "${CMAKE_SOURCE_DIR}" "${EXAMPLE_SOURCE_DIR}")
+    set(EXAMPLE_BUILD_DIR "${CMAKE_BINARY_DIR}/${EXAMPLE_RELATIVE_DIR}")
+
     add_executable( ${ADD_T8_EXAMPLE_NAME} ${ADD_T8_EXAMPLE_SOURCES} )
     target_link_libraries( ${ADD_T8_EXAMPLE_NAME} PRIVATE T8 t8example ${SC_LIBRARIES} m )
     target_include_directories( ${ADD_T8_EXAMPLE_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/.. ${SC_INCLUDE_DIR} )
 
+    set_target_properties(${ADD_T8_EXAMPLE_NAME} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${EXAMPLE_BUILD_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${EXAMPLE_BUILD_DIR}"
+        ARCHIVE_OUTPUT_DIRECTORY "${EXAMPLE_BUILD_DIR}"
+    )
+
     if( T8CODE_EXPORT_COMPILE_COMMANDS )
         set_target_properties( ${ADD_T8_EXAMPLE_NAME} PROPERTIES EXPORT_COMPILE_COMMANDS ON )
     endif( T8CODE_EXPORT_COMPILE_COMMANDS )

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,9 +7,27 @@ function( add_t8_test )
     set( multiValueArgs "SOURCES" )
     cmake_parse_arguments( ADD_T8_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+    # Get the path of the second file listed in the SOURCES list (if there is one then from the first) and use it to determine the build directory.
+    # We use the second file, because the first is t8_gtest_main, which is in the root test dir. The executable will be build in the same directory as the second source file.
+    list (LENGTH ADD_T8_TEST_SOURCES TEST_SOURCES_LENGTH)
+    if ( TEST_SOURCES_LENGTH GREATER 1 )
+        list(GET ADD_T8_TEST_SOURCES 1 TEST_SOURCE)
+    else()
+        list(GET ADD_T8_TEST_SOURCES 0 TEST_SOURCE)
+    endif()
+    get_filename_component(TEST_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/${TEST_SOURCE}" DIRECTORY)
+    file(RELATIVE_PATH TEST_RELATIVE_DIR "${CMAKE_SOURCE_DIR}" "${TEST_SOURCE_DIR}")
+    set(TEST_BUILD_DIR "${CMAKE_BINARY_DIR}/${TEST_RELATIVE_DIR}")
+
     add_executable( ${ADD_T8_TEST_NAME} ${ADD_T8_TEST_SOURCES} )
     target_link_libraries( ${ADD_T8_TEST_NAME} PRIVATE T8 gtest pthread m )
 
+    set_target_properties(${ADD_T8_TEST_NAME} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${TEST_BUILD_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${TEST_BUILD_DIR}"
+        ARCHIVE_OUTPUT_DIRECTORY "${TEST_BUILD_DIR}"
+    )
+
     if( T8CODE_EXPORT_COMPILE_COMMANDS )
         set_target_properties( ${ADD_T8_TEST_NAME} PROPERTIES EXPORT_COMPILE_COMMANDS ON )
     endif( T8CODE_EXPORT_COMPILE_COMMANDS )
@@ -29,7 +47,7 @@ function( add_t8_test )
         separate_arguments (T8CODE_TEST_COMMAND_LIST NATIVE_COMMAND ${T8CODE_CUSTOM_SERIAL_TEST_COMMAND})
     endif ( T8CODE_ENABLE_MPI )
 
-    add_test( NAME ${ADD_T8_TEST_NAME} COMMAND ${T8CODE_TEST_COMMAND_LIST} ./${ADD_T8_TEST_NAME} )
+    add_test( NAME ${ADD_T8_TEST_NAME} COMMAND ${T8CODE_TEST_COMMAND_LIST} ${TEST_BUILD_DIR}/${ADD_T8_TEST_NAME} )
 endfunction()
 
 # Copy test files to build folder so that the t8_test programs can find them.

diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
@@ -4,9 +4,23 @@ function( add_t8_tutorial )
     set( multiValueArgs "SOURCES" )
     cmake_parse_arguments( ADD_T8_TUTORIAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+    # Get the path of the first file listed in the SOURCES list and use it to determine the build directory.
+    # The executable will be build in the same directory as the first source file.
+    list(GET ADD_T8_TUTORIAL_SOURCES 0 FIRST_SOURCE)
+    get_filename_component(TUTORIAL_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/${FIRST_SOURCE}" DIRECTORY)
+    file(RELATIVE_PATH TUTORIAL_RELATIVE_DIR "${CMAKE_SOURCE_DIR}" "${TUTORIAL_SOURCE_DIR}")
+    set(TUTORIAL_BUILD_DIR "${CMAKE_BINARY_DIR}/${TUTORIAL_RELATIVE_DIR}")
+
     add_executable( ${ADD_T8_TUTORIAL_NAME} ${ADD_T8_TUTORIAL_SOURCES} )
+
     target_link_libraries( ${ADD_T8_TUTORIAL_NAME} PRIVATE T8 ${SC_LIBRARIES} m )
     target_include_directories( ${ADD_T8_TUTORIAL_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/.. ${SC_INCLUDE_DIR} )
+
+    set_target_properties(${ADD_T8_TUTORIAL_NAME} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${TUTORIAL_BUILD_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${TUTORIAL_BUILD_DIR}"
+        ARCHIVE_OUTPUT_DIRECTORY "${TUTORIAL_BUILD_DIR}"
+    )
 
     if( T8CODE_EXPORT_COMPILE_COMMANDS )
         set_target_properties( ${ADD_T8_TUTORIAL_NAME} PROPERTIES EXPORT_COMPILE_COMMANDS ON )