Fixes to CMake

ORNL · Oct 20, 2023 · 977e1da · 977e1da
1 parent 5c5bdd8
commit 977e1da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/resolve/cpu/CMakeLists.txt b/resolve/cpu/CMakeLists.txt
@@ -17,6 +17,8 @@ set(ReSolve_CPU_HEADER_INSTALL
 
 # First create dummy backend
 add_library(resolve_backend_cpu SHARED ${ReSolve_CPU_SRC})
+target_link_libraries(resolve_backend_cpu PRIVATE resolve_logger)
+
 target_include_directories(resolve_backend_cpu INTERFACE
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include>

diff --git a/resolve/matrix/CMakeLists.txt b/resolve/matrix/CMakeLists.txt
@@ -40,6 +40,7 @@ endif()
 
 # Build shared library ReSolve::matrix
 add_library(resolve_matrix SHARED ${Matrix_SRC})
+target_link_libraries(resolve_matrix PRIVATE resolve_logger resolve_vector)
 
 # Link to CUDA ReSolve backend if CUDA is support enabled
 if (RESOLVE_USE_CUDA)

diff --git a/resolve/vector/CMakeLists.txt b/resolve/vector/CMakeLists.txt
@@ -31,6 +31,7 @@ if(RESOLVE_USE_CUDA)
 endif()
 
 add_library(resolve_vector SHARED ${Vector_SRC})
+target_link_libraries(resolve_vector PRIVATE resolve_logger)
 
 # Link to ReSolve CUDA backend if CUDA is enabled
 if (RESOLVE_USE_CUDA)

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -6,8 +6,6 @@
 
 ]]
 
-if(RESOLVE_USE_CUDA)
-  add_subdirectory(matrix)
-  add_subdirectory(vector)
-  add_subdirectory(utilities)
-endif(RESOLVE_USE_CUDA)
+add_subdirectory(matrix)
+add_subdirectory(vector)
+add_subdirectory(utilities)