-
Notifications
You must be signed in to change notification settings - Fork 590
[SCIP, SCIP_PaPILO] use bliss_jll and enable boost #6054
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+107
−5
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| diff --git a/scip/CMakeLists.txt b/scip/CMakeLists.txt | ||
| index f7831d9ce8..54915b438f 100644 | ||
| --- a/scip/CMakeLists.txt | ||
| +++ b/scip/CMakeLists.txt | ||
| @@ -125,24 +125,18 @@ unset(BLISS_TARGET) | ||
| if(SYM STREQUAL "bliss") | ||
| message(STATUS "Support SYM: bliss") | ||
| set(sym symmetry/compute_symmetry_bliss.cpp) | ||
| - | ||
| - # modify configuration for bliss | ||
| - set(BUILD_SHARED_LIBS OFF) | ||
| - set(TMPFLAGS ${CMAKE_C_FLAGS}) | ||
| - set(TMXFLAGS ${CMAKE_CXX_FLAGS}) | ||
| - set(CMAKE_C_FLAGS -w) | ||
| - set(CMAKE_CXX_FLAGS -w) | ||
| - | ||
| - add_subdirectory(src/bliss) | ||
| - | ||
| - # undo modification | ||
| - set(CMAKE_C_FLAGS ${TMPFLAGS}) | ||
| - set(CMAKE_CXX_FLAGS ${TMXFLAGS}) | ||
| - set(BUILD_SHARED_LIBS ${SHARED}) | ||
| - | ||
| - set(BLISS_TARGET libbliss) | ||
| - set(SYM_LIBRARIES libbliss) | ||
| - set(SYM_PIC_LIBRARIES libbliss) | ||
| + find_package(BLISS) | ||
| + if(BLISS_FOUND) | ||
| + message(STATUS "BLISS found") | ||
| + include_directories(${BLISS_INCLUDE_DIRS}) | ||
| + set(SYM_LIBRARIES ${BLISS_LIBRARIES}) | ||
| + set(SYM_PIC_LIBRARIES ${BLISS_LIBRARIES}) | ||
| + if(BLISS_DEFINITIONS STREQUAL "") | ||
| + add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${BLISS_DEFINITIONS}>") | ||
| + endif() | ||
| + else() | ||
| + message(FATAL_ERROR "BLISS not found, not using vendored BLISS") | ||
| + endif() | ||
| elseif(SYM STREQUAL "none") | ||
| message(STATUS "Support SYM: OFF") | ||
| set(sym symmetry/compute_symmetry_none.cpp) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| diff --git a/scip/CMakeLists.txt b/scip/CMakeLists.txt | ||
| index f7831d9ce8..54915b438f 100644 | ||
| --- a/scip/CMakeLists.txt | ||
| +++ b/scip/CMakeLists.txt | ||
| @@ -125,24 +125,18 @@ unset(BLISS_TARGET) | ||
| if(SYM STREQUAL "bliss") | ||
| message(STATUS "Support SYM: bliss") | ||
| set(sym symmetry/compute_symmetry_bliss.cpp) | ||
| - | ||
| - # modify configuration for bliss | ||
| - set(BUILD_SHARED_LIBS OFF) | ||
| - set(TMPFLAGS ${CMAKE_C_FLAGS}) | ||
| - set(TMXFLAGS ${CMAKE_CXX_FLAGS}) | ||
| - set(CMAKE_C_FLAGS -w) | ||
| - set(CMAKE_CXX_FLAGS -w) | ||
| - | ||
| - add_subdirectory(src/bliss) | ||
| - | ||
| - # undo modification | ||
| - set(CMAKE_C_FLAGS ${TMPFLAGS}) | ||
| - set(CMAKE_CXX_FLAGS ${TMXFLAGS}) | ||
| - set(BUILD_SHARED_LIBS ${SHARED}) | ||
| - | ||
| - set(BLISS_TARGET libbliss) | ||
| - set(SYM_LIBRARIES libbliss) | ||
| - set(SYM_PIC_LIBRARIES libbliss) | ||
| + find_package(BLISS) | ||
| + if(BLISS_FOUND) | ||
| + message(STATUS "BLISS found") | ||
| + include_directories(${BLISS_INCLUDE_DIRS}) | ||
| + set(SYM_LIBRARIES ${BLISS_LIBRARIES}) | ||
| + set(SYM_PIC_LIBRARIES ${BLISS_LIBRARIES}) | ||
| + if(BLISS_DEFINITIONS STREQUAL "") | ||
| + add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${BLISS_DEFINITIONS}>") | ||
| + endif() | ||
| + else() | ||
| + message(FATAL_ERROR "BLISS not found, not using vendored BLISS") | ||
| + endif() | ||
| elseif(SYM STREQUAL "none") | ||
| message(STATUS "Support SYM: OFF") | ||
| set(sym symmetry/compute_symmetry_none.cpp) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
was this tested on windows? So far I've never managed to have the windows binaries work
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Without this change the linker would complain that it can't find bliss. I did not test it on Windows but I can give it a try in a VM later today.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is optional of course, but if it resolves the problem that would be fantastic
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't seem to change anything, I get the same crashes on Windows (without any meaningful backtrace) when using the current SCIP_jll and with my new binaries.