restore cmakelists

correaa · Mar 6, 2025 · 840d75d · 840d75d
1 parent e129a3f
commit 840d75d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/include/boost/multi/adaptors/blas/CMakeLists.txt b/include/boost/multi/adaptors/blas/CMakeLists.txt
@@ -45,11 +45,7 @@ endif()
 
 if(BLAS_FOUND)
 	find_package(Boost NO_MODULE)  # COMPONENTS boost)  # headers unit_test_framework)
-	if(Boost_FOUND OR (
-	   CMAKE_CXX_COMPILER_ID
-		STREQUAL
-        "NVHPC"
-	))
+	if(Boost_FOUND)
 		add_subdirectory(test)
 	else()
 		message(WARNING "Boost Unit Test Framework not found, BLAS-adaptor tests will not be compiled and run. If you want this feature, install Boost")

diff --git a/include/boost/multi/adaptors/fftw/test/CMakeLists.txt b/include/boost/multi/adaptors/fftw/test/CMakeLists.txt
@@ -43,7 +43,6 @@ set(TEST_SRCS
   combinations.cpp
 # copy.cpp
   core.cpp
-  fft.cpp
   moved.cpp
   shift.cpp
   so_shift.cpp

diff --git a/include/boost/multi/adaptors/lapack/test/CMakeLists.txt b/include/boost/multi/adaptors/lapack/test/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 # set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # set(CMAKE_CXX_EXTENSIONS OFF)
 
-find_package(Boost NO_MODULE)
+find_package(Boost REQUIRED NO_MODULE)
 # add_compile_definitions(${TEST_EXE} PRIVATE ${Boost_DEFINITIONS})
 # include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 # link_libraries(${Boost_LIBRARIES})
@@ -72,6 +72,6 @@ if(ENABLE_CUDA)
     set_source_files_properties(potrf.cpp PROPERTIES LANGUAGE CUDA)
 endif()
 
-target_link_libraries(potrf.cpp.x PRIVATE multi-lapack)  # Boost::boost)
+target_link_libraries(potrf.cpp.x PRIVATE multi-lapack Boost::boost)
 
 add_test(NAME potrf.cpp.x COMMAND $<TARGET_FILE:potrf.cpp.x>)
diff --git a/include/boost/multi/adaptors/mpi/test/CMakeLists.txt b/include/boost/multi/adaptors/mpi/test/CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
 enable_testing()
 include(CTest)
 
-find_package(Boost COMPONENTS NO_MODULE)
+find_package(Boost REQUIRED COMPONENTS NO_MODULE)
 
 add_executable(mpi.cpp.x mpi.cpp)
 
@@ -20,7 +20,7 @@ if(APPLE)
     # add_custom_command (TARGET mpi.cpp.x POST_BUILD COMMAND codesign --force --deep -s ACTMPI ${CMAKE_CURRENT_BINARY_DIR}/mpi.cpp.x)
 endif()
 
-target_link_libraries(mpi.cpp.x PRIVATE multi MPI::MPI_CXX)  # Boost::boost)
+target_link_libraries(mpi.cpp.x PRIVATE multi MPI::MPI_CXX Boost::boost)
 
 if(APPLE)
 #    add_test(NAME mpi.cpp.x COMMAND ${MPIEXEC_EXECUTABLE} --mca btl ^tcp ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} $<TARGET_FILE:mpi.cpp.x> ${MPIEXEC_POSTFLAGS})