Merge remote-tracking branch 'origin/v92-bugfix' into v9-minor

scipopt · Nov 8, 2024 · 694eadd · 694eadd
2 parents 2fd908d + 2ca6a13
commit 694eadd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -51,6 +51,8 @@ Build system
 
 ### Cmake
 
+- fix SCIP Optimization Suite build with -DSYM=bliss and bliss being downloaded and build during configuration by cmake
+
 ### Makefile
 
 Miscellaneous

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,10 +162,10 @@ if(SYM STREQUAL "bliss" OR SYM STREQUAL "sbliss")
         if (NOT Bliss_FOUND)
             message(FATAL_ERROR "Automatic download of Bliss failed. Please specify the BLISS_DIR.")
         endif()
-        include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/local/include)
-        set(SYM_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a)
-        set(SYM_PIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a)
-        message(STATUS "Installed Bliss in: ${CMAKE_CURRENT_BINARY_DIR}/_deps/local")
+        include_directories(${CMAKE_BINARY_DIR}/_deps/local/include)
+        set(SYM_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a)
+        set(SYM_PIC_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a)
+        message(STATUS "Installed Bliss in: ${CMAKE_BINARY_DIR}/_deps/local")
     endif()
 elseif(SYM STREQUAL "nauty" OR SYM STREQUAL "snauty")
     if(NAUTY_DIR)