Skip to content

Commit 119a20e

Browse files
committed
Merge remote-tracking branch 'origin/v9-minor'
2 parents a39a343 + 694eadd commit 119a20e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Diff for: CHANGELOG

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ Build system
151151

152152
### Cmake
153153

154+
- fix SCIP Optimization Suite build with -DSYM=bliss and bliss being downloaded and build during configuration by cmake
155+
154156
### Makefile
155157

156158
Miscellaneous

Diff for: CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ if(SYM STREQUAL "bliss" OR SYM STREQUAL "sbliss")
165165
if (NOT Bliss_FOUND)
166166
message(FATAL_ERROR "Automatic download of Bliss failed. Please specify the BLISS_DIR.")
167167
endif()
168-
include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/local/include)
169-
set(SYM_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a)
170-
set(SYM_PIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a)
171-
message(STATUS "Installed Bliss in: ${CMAKE_CURRENT_BINARY_DIR}/_deps/local")
168+
include_directories(${CMAKE_BINARY_DIR}/_deps/local/include)
169+
set(SYM_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a)
170+
set(SYM_PIC_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a)
171+
message(STATUS "Installed Bliss in: ${CMAKE_BINARY_DIR}/_deps/local")
172172
endif()
173173
elseif(SYM STREQUAL "nauty" OR SYM STREQUAL "snauty")
174174
if(NAUTY_DIR)

0 commit comments

Comments
 (0)