Skip to content

Commit 8029662

Browse files
committed
Merge branch 'revert-c552d1d2' into 'master'
Revert "Merge branch 'automatic-soplex+papilo' into 'master'" See merge request integer/scip!3470
2 parents 24fd43b + a78af93 commit 8029662

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

CHANGELOG

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

6969
### Cmake
7070

71-
- cmake now automatically downloads and installs the latest release version of SoPlex+PaPilo from GitHub if they are not found directly
72-
7371
Fixed bugs
7472
----------
7573

CMakeLists.txt

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -401,16 +401,8 @@ endif()
401401
if(PAPILO OR AUTOBUILD)
402402
message(STATUS "Finding PAPILO")
403403
find_package(PAPILO CONFIG HINTS ${PAPILO_DIR})
404-
if(NOT PAPILO_FOUND)
405-
# Utilities to automatically download missing dependencies
406-
include(cmake/Dependencies.cmake)
407-
find_or_download_package(
408-
NAME PAPILO
409-
VERSION 2.2.1
410-
URL https://github.com/scipopt/papilo/archive/refs/tags/v2.2.1.tar.gz
411-
URL_HASH SHA256=b022af82bda3db1a594fe67524d98be82e67279f9d9d645b2fcdfc9349cdc6f7
412-
COMPONENTS papilo)
413-
find_package(PAPILO REQUIRED CONFIG HINTS _deps/local)
404+
if((NOT PAPILO_FOUND) AND (NOT AUTOBUILD))
405+
message(FATAL_ERROR "PAPILO not found, try specifying PAPILO_DIR. ${AUTOBUILD_MSG}")
414406
endif()
415407
endif()
416408
if(PAPILO_FOUND)
@@ -426,18 +418,7 @@ endif()
426418
message(STATUS "Finding Solver \"${LPS}\"")
427419
if(LPS STREQUAL "spx")
428420
message(STATUS "Finding Soplex")
429-
find_package(SOPLEX CONFIG HINTS ${SOPLEX_DIR})
430-
if(NOT SOPLEX_FOUND)
431-
# Utilities to automatically download missing dependencies
432-
include(cmake/Dependencies.cmake)
433-
find_or_download_package(
434-
NAME SOPLEX
435-
VERSION 7.0.1
436-
URL https://github.com/scipopt/soplex/archive/refs/tags/release-701.tar.gz
437-
URL_HASH SHA256=80cce994dcbe45fd52b60e31a3aeb5d2c60a7ddbaae495e0ce6bf58481675696
438-
COMPONENTS soplex)
439-
find_package(SOPLEX REQUIRED CONFIG HINTS _deps/local)
440-
endif()
421+
find_package(SOPLEX REQUIRED CONFIG HINTS ${SOPLEX_DIR})
441422
if (DEFINED SOPLEX_WITH_PAPILO)
442423
message(STATUS "SOPLEX links PAPILO")
443424
if((NOT SCIP_WITH_PAPILO)) # TODO not sure how to handle AUTOBUILD

0 commit comments

Comments
 (0)