Fix exported CMake bug in CXX_STANDARD

ORNL · Nov 2, 2023 · 8fcca3e · 8fcca3e
1 parent 508bd81
commit 8fcca3e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -25,7 +25,7 @@
             "installDir": "${sourceDir}/install",
             "generator": "Unix Makefiles"
         },
-	      {
+	    {
             "name": "ascent",
             "inherits": "cuda",
             "displayName": "Ascent Build",

diff --git a/cmake/ReSolveConfig.cmake.in b/cmake/ReSolveConfig.cmake.in
@@ -4,6 +4,10 @@
 
 include("${CMAKE_CURRENT_LIST_DIR}/ReSolveTargets.cmake")
 
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD @CMAKE_CXX_STANDARD@)
+endif()
+
 include(CheckLanguage)
 # This must come before enable_language(CUDA)
 if(@RESOLVE_USE_CUDA@)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -71,8 +71,11 @@ set(CONSUMER_PATH ${CMAKE_INSTALL_PREFIX}/share/examples)
 install(PROGRAMS test.sh DESTINATION ${CONSUMER_PATH})
 
 # Select consumer app
+# TODO - have an outer loop that adds a unique consumer test for each backend supproted
 if(RESOLVE_USE_CUDA)
   set(RESOLVE_CONSUMER_APP "testKLU_Rf_FGMRES.cpp")
+elseif(RESOLVE_USE_HIP)
+  set(RESOLVE_CONSUMER_APP "testKLU_RocSolver.cpp")
 else()
   set(RESOLVE_CONSUMER_APP "testKLU.cpp")
 endif()

diff --git a/examples/resolve_consumer/CMakeLists.txt b/examples/resolve_consumer/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(ReSolve REQUIRED)
 
 # Build example with KLU factorization and KLU refactorization
 add_executable(consume.exe consumer.cpp)
-target_link_libraries(consume.exe PRIVATE ReSolve::ReSolve)
+target_link_libraries(consume.exe PUBLIC ReSolve::ReSolve)
 
 #------------------------------------------------------------------------------------
 # Testing of exported Resolve Configurations