cmake: clear errors, now compiling errors

ERGO-Code · Aug 26, 2024 · dd5ce41 · dd5ce41
1 parent 0ac0cec
commit dd5ce41
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 19 deletions.
diff --git a/cmake/cpp-highs.cmake b/cmake/cpp-highs.cmake
@@ -48,18 +48,35 @@ install(FILES ${PROJECT_BINARY_DIR}/highs_export.h
 
 string (TOLOWER ${PROJECT_NAME} lower)
 
-install(TARGETS highs
-   EXPORT ${lower}-targets
-   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs)
-
-# Add library targets to the build-tree export set
-export(TARGETS highs
-  NAMESPACE ${PROJECT_NAMESPACE}::highs
-  FILE "${HIGHS_BINARY_DIR}/highs-targets.cmake")
+if (NOT CUPDLP_GPU)
+    install(TARGETS highs
+      EXPORT ${lower}-targets
+      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs)
+
+    # Add library targets to the build-tree export set
+    export(TARGETS highs
+      NAMESPACE ${PROJECT_NAMESPACE}::highs
+      FILE "${HIGHS_BINARY_DIR}/highs-targets.cmake")
+else()
+
+    install(TARGETS highs cudalin
+      EXPORT ${lower}-targets
+      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/highs)
+
+    # Add library targets to the build-tree export set
+    export(TARGETS highs cudalin
+      NAMESPACE ${PROJECT_NAMESPACE}::highs
+      FILE "${HIGHS_BINARY_DIR}/highs-targets.cmake")
+endif()
+
 
 install(EXPORT ${lower}-targets
   NAMESPACE ${PROJECT_NAMESPACE}::

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -181,7 +181,7 @@ else()
 
   # Optional Cuda 
   if (CUPDLP_GPU)
-    add_subdirectory(cupdlp)
+    add_subdirectory(pdlp/cupdlp)
   endif()
 
   if(MSVC)

diff --git a/src/pdlp/cupdlp/CMakeLists.txt b/src/pdlp/cupdlp/CMakeLists.txt
@@ -9,6 +9,6 @@ else()
     add_subdirectory(cuda)
     message(NOTICE "- GPU version PDLP")
     target_include_directories(highs PUBLIC "/usr/local/cuda/include")
-    target_link_libraries(highs PRIVATE cudalin ${CUDA_LIBRARY} m)
+    target_link_libraries(highs cudalin ${CUDA_LIBRARY} m)
     set_target_properties(highs PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 endif ()
diff --git a/src/pdlp/cupdlp/cuda/CMakeLists.txt b/src/pdlp/cupdlp/cuda/CMakeLists.txt
@@ -1,10 +1,10 @@
 enable_language(CXX CUDA)
 
 add_library(cudalin SHARED
-       ${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cuda_kernels.cu
-       ${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cuda_kernels.cuh
-       ${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cudalinalg.cuh
-       ${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cudalinalg.cu
+       ${CMAKE_SOURCE_DIR}/src/pdlp/cupdlp/cuda/cupdlp_cuda_kernels.cu
+       ${CMAKE_SOURCE_DIR}/src/pdlp/cupdlp/cuda/cupdlp_cuda_kernels.cuh
+       ${CMAKE_SOURCE_DIR}/src/pdlp/cupdlp/cuda/cupdlp_cudalinalg.cuh
+       ${CMAKE_SOURCE_DIR}/src/pdlp/cupdlp/cuda/cupdlp_cudalinalg.cu
 )
 
 set_target_properties(cudalin PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
@@ -27,4 +27,3 @@ target_link_libraries(testcudalin PRIVATE cudalin ${CUDA_LIBRARY})
 
 set_target_properties(testcublas PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 target_link_libraries(testcublas PRIVATE cudalin ${CUDA_LIBRARY})
-