Skip to content

Commit

Permalink
Merge branch 'fix-zlib-linking-in-autobuild' into 'v80-bugfix'
Browse files Browse the repository at this point in the history
Fix ZLIB being linked even though it has not been found in AUTOBUILD

See merge request integer/scip!3107
  • Loading branch information
ju-manns committed Jul 13, 2023
2 parents cfd4a4a + 23611dc commit a8e51af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ target_include_directories(libscip PUBLIC
target_link_libraries(libscip
PRIVATE
${SYM_LIBRARIES}
$<$<BOOL:${ZLIB}>:ZLIB::ZLIB>
$<$<BOOL:${SCIP_WITH_ZLIB}>:ZLIB::ZLIB>
${Readline_LIBRARY}
${GMP_LIBRARIES}
${THREAD_LIBRARIES}
Expand Down Expand Up @@ -1071,7 +1071,7 @@ endif()

target_link_libraries(scip
${SYM_LIBRARIES}
$<$<BOOL:${ZLIB}>:ZLIB::ZLIB>
$<$<BOOL:${SCIP_WITH_ZLIB}>:ZLIB::ZLIB>
${Readline_LIBRARY}
${GMP_LIBRARIES}
${ZIMPL_LIBRARIES}
Expand Down

0 comments on commit a8e51af

Please sign in to comment.