fixup! [FIX] Improve build system when compiling with colpack

Author: TimSiebert1

CMakeLists.txt

@@ -173,34 +173,42 @@ endif()
 set(ADOLC_BITWORD_BITS 32)
 target_compile_definitions(adolc PUBLIC 
               ADOLC_BITWORD_BITS=${ADOLC_BITWORD_BITS})
-if (ENABLE_SPARSE)
-    if (WIN32)
-        message(FATAL_ERROR "Sparse drivers require OpenMP, which is not supported on Windows/MSVC. ")
-    endif()
-
-  find_package(ColPack)
-  if (ColPack_FOUND)
-      message(STATUS "Using system-installed ColPack at ${ColPack_DIR}")
 
-      # Prefer shared if it exists (usually the case)
-      if (TARGET ColPack_static)
-          target_link_libraries(adolc PRIVATE ColPack_static)
-      else()
-          message(FATAL_ERROR "ColPack was found but provides no usable CMake targets")
-      endif()
+if (ENABLE_SPARSE)
+  if (WIN32)
+      message(FATAL_ERROR "Sparse drivers require OpenMP, which is not supported on Windows/MSVC. ")
   endif()
 
-  if (NOT ColPack_FOUND)
-    message(STATUS "System ColPack not found! Pulling from https://github.com/TimSiebert1/ColPack")
+  # System ColPack branch
+  if (ColPack_DIR)
+    find_package(ColPack CONFIG REQUIRED "${ColPack_DIR}") 
+    message(STATUS "Using system-installed ColPack at ${ColPack_DIR}")
+    target_link_libraries(adolc PRIVATE ColPack::ColPack_shared)
+
+  else ()
+    message(STATUS "System ColPack_DIR not provided! Pulling from https://github.com/TimSiebert1/ColPack")
     include(FetchContent)
     FetchContent_declare(
         ColPack
         GIT_REPOSITORY https://github.com/TimSiebert1/ColPack
-        GIT_TAG 96eca73724eb517cfb2cc66d8be448e91a30483f # latest commit
+        GIT_TAG 6ca3669b1b37f1d575cc0934628d09ee5cd8cb12 # latest commit
         CMAKE_ARGS -DENABLE_OPENMP=ON # colpack needs openmp to build
     )
     FetchContent_MakeAvailable(ColPack)
-    target_link_libraries(adolc PRIVATE ColPack::ColPack_static)
+    target_link_libraries(adolc PRIVATE ColPack::ColPack_shared)
+
+    # Ensure feature_summary lists it
+    set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND ColPack)
+    set_property(GLOBAL APPEND PROPERTY _CMAKE_ColPack_TYPE REQUIRED)
+
+    # Install ColPack if ADOL-C is installed
+    if (TARGET ColPack_shared)
+      install(TARGETS ColPack_shared
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      )
+    endif()
   endif()
   set(ADOLC_SPARSE "#define ADOLC_SPARSE 1")
 endif()
@@ -276,8 +284,11 @@ include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 install(TARGETS adolc
-        EXPORT adolcTargets
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/adolc)
+  EXPORT adolcTargets
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
 
 install(EXPORT adolcTargets
   FILE adolc-targets.cmake

README.md

@@ -45,7 +45,7 @@ Customize the build with the following options
 
   `-DENABLE_BOOST_POOL=1` Enable the use of boost pool (default=False)
 
-  `-DENABLE_SPARSE=1` Build with Colpack to enable sparse AD (default=False)
+  `-DENABLE_SPARSE=1` Build with Colpack to enable sparse AD (default=False, ColPack is either downloaded via FetchContent or if `ColPack_DIR` provides a path to ColPack's `ColPackConfig.cmake` this is used instead)
 
   `-DBUILD_INTERFACE=1` Build the c interface (default=False)