fix cmake after rebase

ginkgo-project · Aug 16, 2022 · e3464ab · e3464ab
1 parent 273e247
commit e3464ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake
@@ -9,6 +9,15 @@ function(ginkgo_build_test_name test_name target_name)
     set(${target_name} ${TEST_TARGET_NAME} PARENT_SCOPE)
 endfunction(ginkgo_build_test_name)
 
+function(ginkgo_create_gtest_mpi_main)
+    add_library(gtest_mpi_main "")
+    target_sources(gtest_mpi_main
+      PRIVATE
+      ${PROJECT_SOURCE_DIR}/core/test/mpi/gtest/mpi_listener.cpp)
+    find_package(MPI REQUIRED)
+    target_link_libraries(gtest_mpi_main PRIVATE GTest::GTest MPI::MPI_CXX)
+endfunction(ginkgo_create_gtest_mpi_main)
+
 ## Set up shared target properties and handle ADDITIONAL_LIBRARIES/ADDITIONAL_INCLUDES
 ## `MPI_SIZE size` causes the tests to be run with `size` MPI processes.
 function(ginkgo_set_test_target_properties test_target_name)
@@ -23,6 +32,9 @@ function(ginkgo_set_test_target_properties test_target_name)
         target_link_libraries(${test_target_name} PRIVATE "${GINKGO_CIRCULAR_DEPS_FLAGS}")
     endif()
     if (set_properties_MPI_SIZE)
+        if(NOT TARGET gtest_mpi_main)
+            ginkgo_create_gtest_mpi_main()
+        endif()
         set(gtest_main gtest_mpi_main MPI::MPI_CXX)
     else()
         set(gtest_main GTest::Main)
@@ -40,6 +52,7 @@ endfunction()
 ## - `ADDITIONAL_LIBRARIES lib1 lib2` adds additional target link dependencies
 ## - `ADDITIONAL_INCLUDES path1 path2` adds additional target include paths
 function(ginkgo_add_test test_name test_target_name)
+    message("${test_name} ${test_target_name} ${ARGN}")
     cmake_parse_arguments(PARSE_ARGV 2 add_test "" "${gko_test_single_arg}" "${gko_test_multi_arg}")
     file(RELATIVE_PATH REL_BINARY_DIR ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
     set_target_properties(${test_target_name} PROPERTIES OUTPUT_NAME ${test_name})
@@ -80,7 +93,6 @@ function(ginkgo_create_dpcpp_test test_name)
     target_compile_features(${test_target_name} PUBLIC cxx_std_17)
     target_compile_options(${test_target_name} PRIVATE ${GINKGO_DPCPP_FLAGS})
     target_link_options(${test_target_name} PRIVATE -fsycl-device-code-split=per_kernel)
-    ginkgo_internal_add_test(${test_target_name} ${ARGN})
     ginkgo_add_test(${test_name} ${test_target_name} ${ARGN})
     # Note: MKL_ENV is empty on linux. Maybe need to apply MKL_ENV to all test.
     if (MKL_ENV)
@@ -115,7 +127,6 @@ function(ginkgo_create_cuda_test_internal test_name filename test_target_name)
     if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
         set_target_properties(${test_target_name} PROPERTIES CUDA_ARCHITECTURES OFF)
     endif()
-    ginkgo_internal_add_test(${test_target_name} ${ARGN})
     ginkgo_add_test(${test_name} ${test_target_name} ${ARGN})
 endfunction(ginkgo_create_cuda_test_internal)
 
@@ -205,7 +216,7 @@ function(ginkgo_create_common_test_internal test_name exec_type exec)
         target_compile_definitions(${test_target_name} PRIVATE GINKGO_COMMON_SINGLE_MODE=1)
         target_compile_definitions(${test_target_name} PRIVATE GINKGO_DPCPP_SINGLE_MODE=1)
     endif()
-    ginkgo_internal_add_test(${test_target_name} ${ARGN})
+    ginkgo_set_test_target_properties(${test_target_name} ${ARGN})
     ginkgo_add_test(${test_name}_${exec} ${test_target_name} ${ARGN})
 endfunction(ginkgo_create_common_test_internal)
 

diff --git a/core/test/mpi/distributed/CMakeLists.txt b/core/test/mpi/distributed/CMakeLists.txt
@@ -1 +1 @@
-ginkgo_create_mpi_test(matrix 3)
+ginkgo_create_test(matrix MPI_SIZE 3)
diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt
@@ -1,2 +1,2 @@
-ginkgo_create_common_and_reference_mpi_test(matrix 3)
-ginkgo_create_common_and_reference_mpi_test(vector 3)
+ginkgo_create_common_test(matrix MPI_SIZE 3)
+ginkgo_create_common_test(vector MPI_SIZE 3)