Skip to content

Commit 7690fab

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 53b4c3d + 2a4fe58 commit 7690fab

File tree

20 files changed

+34
-26
lines changed

20 files changed

+34
-26
lines changed

CMakeLists.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,10 @@ endif()
441441
if(SCIP_WITH_GMP OR AUTOBUILD)
442442
message(STATUS "Finding GMP")
443443
find_package(GMP)
444-
if(NOT GMP_FOUND)
444+
if(GMP_FOUND)
445+
set(SCIP_WITH_GMP ON)
446+
message(STATUS "Finding GMP - found")
447+
else()
445448
set(SCIP_WITH_EXACTSOLVE OFF)
446449
set(SCIP_WITH_GMP OFF)
447450
if(NOT AUTOBUILD) # GMP was explicitly requested.
@@ -455,7 +458,7 @@ if(SCIP_WITH_GMP OR AUTOBUILD)
455458
endif()
456459
endif()
457460
else()
458-
message(STATUS "Skipping GMP.")
461+
message(STATUS "Support GMP: OFF")
459462
endif()
460463
if(SCIP_WITH_GMP)
461464
# TODO: Avoid global usage.
@@ -468,7 +471,9 @@ endif()
468471
if(SCIP_WITH_EXACTSOLVE AND SCIP_WITH_MPFR)
469472
message(STATUS "Finding MPFR")
470473
find_package(MPFR)
471-
if(NOT MPFR_FOUND)
474+
if(MPFR_FOUND)
475+
message(STATUS "Finding MPFR - found")
476+
else()
472477
set(SCIP_WITH_MPFR OFF)
473478
set(SCIP_WITH_EXACTSOLVE OFF)
474479
if(MPFR AND NOT (MPFR STREQUAL "AUTO")) # MPFR was explicitly requested.
@@ -480,7 +485,7 @@ if(SCIP_WITH_EXACTSOLVE AND SCIP_WITH_MPFR)
480485
endif()
481486
endif()
482487
else()
483-
message(STATUS "Skipping MPFR.")
488+
message(STATUS "Support MPFR: OFF")
484489
endif()
485490

486491
# look for presolvelib
@@ -690,7 +695,7 @@ if(SCIP_WITH_EXACTSOLVE)
690695
endif()
691696

692697
# Find exact LP solvers.
693-
set(TEST_EXAXTSOLVE OFF)
698+
set(TEST_EXACTSOLVE OFF)
694699
set(SCIP_WITH_LPSEXACT OFF) # Human-readable name of exact LP solver
695700
if(SCIP_WITH_EXACTSOLVE)
696701
# SoPlex
@@ -712,7 +717,7 @@ if(SCIP_WITH_EXACTSOLVE)
712717
endif()
713718
if(SOPLEX_FOUND AND SOPLEX_WITH_MPFR)
714719
set(SCIP_WITH_LPSEXACT "SoPlex")
715-
set(TEST_EXAXTSOLVE ON)
720+
set(TEST_EXACTSOLVE ON)
716721
elseif(LPSEXACT_UPPER STREQUAL "SPX" AND NOT (EXACTSOLVE_UPPER STREQUAL "AUTO")) # SoPlex and EXACTSOLVE were explicitly requested.
717722
message(FATAL_ERROR "LP solver SoPlex ${BAD_SOPLEX_REASON}, which is required for EXACTSOLVE; try specifying SOPLEX_DIR.")
718723
elseif(LPSEXACT_UPPER STREQUAL "SPX") # SoPlex was explicitly requested, but EXACTSOLVE is AUTO.
@@ -733,7 +738,7 @@ if(SCIP_WITH_EXACTSOLVE)
733738
if(QSOEX_FOUND AND EGLIB_FOUND)
734739
set(SCIP_WITH_LPSEXACT "QSopt_ex")
735740
set(SCIP_WITH_EGLIB ON)
736-
set(TEST_EXAXTSOLVE ON)
741+
set(TEST_EXACTSOLVE ON)
737742
elseif(LPSEXACT_UPPER STREQUAL "QSOEX" AND NOT (EXACTSOLVE_UPPER STREQUAL "AUTO")) # QSopt_ex and EXACTSOLVE were explicitly requested.
738743
message(FATAL_ERROR "Exact LP solver QSopt_ex not found, which is required for EXACTSOLVE; try specifying QSOEX_DIR.")
739744
elseif(LPSEXACT_UPPER STREQUAL "QSOEX") # QSopt_ex was explicitly requested, but EXACTSOLVE is AUTO.

CMakePresets.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"READLINE": "Off",
3131
"ZLIB": "Off",
3232
"GMP": "Off",
33-
"LPS": "none"
33+
"MPFR": "Off",
34+
"EXACTSOLVE": "Off",
35+
"LPS": "none",
36+
"LPSEXACT": "none"
3437
}
3538
},
3639
{

applications/Coloring/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(Coloring)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

applications/CycleClustering/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(CycleClustering)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

applications/MinIISC/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(MinIISC)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

applications/PBSolver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(PBSolver)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

applications/Ringpacking/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(Rinpacking)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

applications/Scheduler/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(Scheduler)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

examples/Binpacking/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(Binpacking)
99

1010
if(TARGET SCIP::SCIP)
1111
# find package by SCIP PATH
12-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
12+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1313
else()
1414
find_package(SCIP REQUIRED)
1515
endif()

examples/CallableLibrary/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include(CTest)
1010

1111
if(TARGET SCIP::SCIP)
1212
# find package by SCIP PATH
13-
find_package(SCIP CONFIG PATHS ${SCIP_BINARY_DIR} REQUIRED)
13+
find_package(SCIP CONFIG NO_DEFAULT_PATH PATHS ${SCIP_BINARY_DIR} REQUIRED)
1414
else()
1515
find_package(SCIP REQUIRED)
1616
endif()

0 commit comments

Comments
 (0)