Merge remote-tracking branch 'origin/v9-minor'

scipopt · Feb 20, 2025 · 0ad062d · 0ad062d
2 parents 16255e5 + 9bf235a
commit 0ad062d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -262,6 +262,7 @@ Build system
 ### Cmake
 
 -  allow to set HIGHS_DIR via -D flag as well
+- reenable building and testing of SCFLP example
 
 ### Makefile
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,7 +2,7 @@ add_custom_target(examples)
 
 add_subdirectory(Binpacking EXCLUDE_FROM_ALL)
 add_subdirectory(CallableLibrary EXCLUDE_FROM_ALL)
-#add_subdirectory(SCFLP EXCLUDE_FROM_ALL)
+add_subdirectory(SCFLP EXCLUDE_FROM_ALL)
 add_subdirectory(Eventhdlr EXCLUDE_FROM_ALL)
 add_subdirectory(GMI EXCLUDE_FROM_ALL)
 add_subdirectory(LOP EXCLUDE_FROM_ALL)

diff --git a/examples/SCFLP/check/CMakeLists.txt b/examples/SCFLP/check/CMakeLists.txt
@@ -87,6 +87,7 @@ if( DEFINED IPOPT_FOUND AND DEFINED LPS )
           #
           # call the SCFLP binary and validate the solve with the given objective value
           #
+          if(FALSE)  # these currently take too long to be a test
           add_test(NAME "examples-scflp-quad-${basename}"
                   COMMAND $<TARGET_FILE:scflp> -s ${CMAKE_CURRENT_SOURCE_DIR}/../settings/nobenders-quad.set -f ${CMAKE_CURRENT_SOURCE_DIR}/../data/${basename}.cap -o ${optval} ${optval}
                   )
@@ -103,6 +104,7 @@ if( DEFINED IPOPT_FOUND AND DEFINED LPS )
                         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>
                   )
           endif()
+          endif(FALSE)
 
           #
           # call the SCFLP binary and validate the solve with the given objective value