BLD: cmake additions
#1604
Merged
BLD: cmake additions
#1604
Conversation
This file contains 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
|
@barracuda156 I think this should work alright? |
Closes ERGO-Codegh-1549 Co-authored-by: ogmundur <ogmundur@users.noreply.github.com>
HaoZeke
force-pushed
the
cmakeAdditions
branch
from
8281bdf
to
781b2f4
Compare
|
@HaoZeke I can pull your branch and try now. |
|
@HaoZeke It is interesting. Configure works fine: But flag is not passed, and build fails: |
|
Relevant part of configure log: |
|
@barracuda156 could you try applying this patch? diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
index e197c117b..3a898b16c 100644
--- i/src/CMakeLists.txt
+++ w/src/CMakeLists.txt
@@ -817,6 +817,13 @@ find_package(Threads)
if(Threads_FOUND)
include(CheckAtomic)
+if(HAVE_CXX_ATOMICS64_WITH_LIB)
+ if(FAST_BUILD)
+ target_link_libraries(highs PUBLIC atomic)
+ else()
+ target_link_libraries(libhighs PUBLIC atomic)
+ endif()
+endif()
endif()Using |
|
@HaoZeke @jajhall And CMakeCache has: So I guess something goes wrong with the logic of when the flag is added and when not. Configure check results look correct, but flag is not added. |
|
@HaoZeke CMake refuses to accept this patch: |
Oh damn, it should be: if(Threads_FOUND)
include(CheckAtomic)
if(HAVE_CXX_ATOMICS64_WITH_LIB)
if(FAST_BUILD)
target_link_libraries(highs atomic)
else()
target_link_libraries(libhighs atomic)
endif()
endif()
endif()(removing the PUBLIC keyword since it wasn't used for ZLIB) |
|
Yes, now it works: |
Awesome, thanks for confirming. Opened #1605 to finally close this out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #1549. Also modifies the
libatomiccheck as discussed in #1603 (comment).