Skip to content

Commit 7611aed

Browse files
committed
Merge remote-tracking branch 'origin/v92-bugfix' into v9-minor
2 parents 827a646 + 06d95de commit 7611aed

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Build system
6868

6969
- disable setting the boolean variable MACOSX_RPATH to a string value to actually enable @rpath usage
7070

71+
- define SOPLEX_NEEDED and ZIMPL_NEEDED to avoid syntax error in configuration file
72+
7173
### Makefile
7274

7375
Miscellaneous

src/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,14 +1062,18 @@ target_link_libraries(libscip
10621062
${LAPACK_LIBRARIES}
10631063
${PAPILO_IMPORTED_TARGETS})
10641064

1065+
set(SOPLEX_NEEDED 0)
1066+
set(ZIMPL_NEEDED 0)
10651067
if(SHARED)
1066-
set(SOPLEX_NEEDED 0)
1067-
set(ZIMPL_NEEDED 0)
10681068
target_link_libraries(libscip PRIVATE ${ZIMPL_PIC_LIBRARIES} ${LPS_PIC_LIBRARIES} ${SYM_PIC_LIBRARIES})
10691069
add_executable(scip main.c ${scipsources} ${objscipsources} ${lpisources} ${tpisources} ${symsources})
10701070
else()
1071-
set(SOPLEX_NEEDED ${SOPLEX_FOUND})
1072-
set(ZIMPL_NEEDED ${ZIMPL_FOUND})
1071+
if(SOPLEX_FOUND)
1072+
set(SOPLEX_NEEDED 1)
1073+
endif()
1074+
if(ZIMPL_FOUND)
1075+
set(ZIMPL_NEEDED 1)
1076+
endif()
10731077
target_link_libraries(libscip PRIVATE ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES})
10741078
add_executable(scip main.c)
10751079
target_link_libraries(scip PUBLIC libscip)

0 commit comments

Comments
 (0)