Merge remote-tracking branch 'origin/v9-minor'

scipopt · Nov 20, 2024 · c69b04a · c69b04a
2 parents e899d0b + 535f6b0
commit c69b04a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 122 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -160,7 +160,8 @@ Build system
 
 ### Cmake
 
-- fix SCIP Optimization Suite build with -DSYM=bliss and bliss being downloaded and build during configuration by cmake
+- fix SCIP Optimization Suite build with -DSYM=(s)bliss and bliss being downloaded and build during configuration by cmake
+- fix use of a bliss cmake installation (from https://github.com/scipopt/bliss) specified via BLISS_DIR if -DSYM=(s)bliss
 
 ### Makefile
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,11 +136,9 @@ if(SYM STREQUAL "bliss" OR SYM STREQUAL "sbliss")
 
     find_package(Bliss CONFIG HINTS ${BLISS_DIR})
     if(Bliss_FOUND)
-        get_filename_component(BLISS_ABSOLUTE_PATH ${Bliss_DIR}/../../.. REALPATH)
-        include_directories(${BLISS_ABSOLUTE_PATH}/include)
-        set(SYM_LIBRARIES ${BLISS_ABSOLUTE_PATH}/lib/libbliss.a)
-        set(SYM_PIC_LIBRARIES ${BLISS_ABSOLUTE_PATH}/lib/libbliss.a)
-        message(STATUS "Found Bliss: ${BLISS_ABSOLUTE_PATH}")
+        set(SYM_LIBRARIES Bliss::libbliss)
+        set(SYM_PIC_LIBRARIES Bliss::libbliss)
+        message(STATUS "Found Bliss: ${Bliss_DIR}")
     else()
         # Utilities to automatically download missing dependencies
         include(cmake/Dependencies.cmake)

diff --git a/cmake/Modules/FindBLISS.cmake b/cmake/Modules/FindBLISS.cmake