Commit 9a177d58 authored by Kersten Schuster's avatar Kersten Schuster

Do not pull coin-related packages into project by default as coin uses...

Do not pull coin-related packages into project by default as coin uses register keyword which is deprecated in modern C++ and even forbidden in C++17.
parent cbaed7b7
Pipeline #9977 passed with stages
in 6 minutes and 46 seconds
...@@ -197,9 +197,9 @@ if (IPOPT_FOUND) ...@@ -197,9 +197,9 @@ if (IPOPT_FOUND)
list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIRS} ) list( APPEND COMISO_LINK_DIRECTORIES ${IPOPT_LIBRARY_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARIES} ) list( APPEND COMISO_LINK_LIBRARIES ${IPOPT_LIBRARIES} )
if ( IPOPT_HSL_LIBRARY_DIR ) if ( IPOPT_HSL_LIBRARY_DIR )
set (COMISO_HSL_CONFIG_FILE_SETTINGS "#define COMISO_HSL_AVAILABLE 1" ) set (COMISO_HSL_CONFIG_FILE_SETTINGS "#define COMISO_HSL_AVAILABLE 1" )
else () else ()
set (COMISO_HSL_CONFIG_FILE_SETTINGS "#define COMISO_HSL_AVAILABLE 0" ) set (COMISO_HSL_CONFIG_FILE_SETTINGS "#define COMISO_HSL_AVAILABLE 0" )
endif() endif()
else () else ()
message (STATUS "IPOPT or dependency not found!") message (STATUS "IPOPT or dependency not found!")
...@@ -225,55 +225,55 @@ else () ...@@ -225,55 +225,55 @@ else ()
set (COMISO_DCO_CONFIG_FILE_SETTINGS "#define COMISO_DCO_AVAILABLE 0" ) set (COMISO_DCO_CONFIG_FILE_SETTINGS "#define COMISO_DCO_AVAILABLE 0" )
endif () endif ()
find_package (CBC) #find_package (CBC)
if (CBC_FOUND ) #if (CBC_FOUND )
set (COMISO_CBC_CONFIG_FILE_SETTINGS "#define COMISO_CBC_AVAILABLE 1" ) # set (COMISO_CBC_CONFIG_FILE_SETTINGS "#define COMISO_CBC_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CBC_INCLUDE_DIRS} ) # list( APPEND COMISO_INCLUDE_DIRECTORIES ${CBC_INCLUDE_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${CBC_LIBRARIES} ) # list( APPEND COMISO_LINK_LIBRARIES ${CBC_LIBRARIES} )
else () #else ()
message (STATUS "CBC not found!") # message (STATUS "CBC not found!")
set (COMISO_CBC_CONFIG_FILE_SETTINGS "#define COMISO_CBC_AVAILABLE 0" ) # set (COMISO_CBC_CONFIG_FILE_SETTINGS "#define COMISO_CBC_AVAILABLE 0" )
endif () #endif ()
find_package (CLP) #find_package (CLP)
if (CLP_FOUND ) #if (CLP_FOUND )
set (COMISO_CLP_CONFIG_FILE_SETTINGS "#define COMISO_CLP_AVAILABLE 1" ) # set (COMISO_CLP_CONFIG_FILE_SETTINGS "#define COMISO_CLP_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CLP_INCLUDE_DIRS} ) # list( APPEND COMISO_INCLUDE_DIRECTORIES ${CLP_INCLUDE_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${CLP_LIBRARIES} ) # list( APPEND COMISO_LINK_LIBRARIES ${CLP_LIBRARIES} )
else () #else ()
message (STATUS "CLP not found!") # message (STATUS "CLP not found!")
set (COMISO_CLP_CONFIG_FILE_SETTINGS "#define COMISO_CLP_AVAILABLE 0" ) # set (COMISO_CLP_CONFIG_FILE_SETTINGS "#define COMISO_CLP_AVAILABLE 0" )
endif () #endif ()
find_package (CGL) #find_package (CGL)
if (CGL_FOUND ) #if (CGL_FOUND )
set (COMISO_CGL_CONFIG_FILE_SETTINGS "#define COMISO_CGL_AVAILABLE 1" ) # set (COMISO_CGL_CONFIG_FILE_SETTINGS "#define COMISO_CGL_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${CGL_INCLUDE_DIRS} ) # list( APPEND COMISO_INCLUDE_DIRECTORIES ${CGL_INCLUDE_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${CGL_LIBRARIES} ) # list( APPEND COMISO_LINK_LIBRARIES ${CGL_LIBRARIES} )
else () #else ()
message (STATUS "CGL not found!") # message (STATUS "CGL not found!")
set (COMISO_CGL_CONFIG_FILE_SETTINGS "#define COMISO_CGL_AVAILABLE 0" ) # set (COMISO_CGL_CONFIG_FILE_SETTINGS "#define COMISO_CGL_AVAILABLE 0" )
endif () #endif ()
find_package (COINUTILS) #find_package (COINUTILS)
if (COINUTILS_FOUND ) #if (COINUTILS_FOUND )
set (COMISO_COINUTILS_CONFIG_FILE_SETTINGS "#define COMISO_COINUTILS_AVAILABLE 1" ) # set (COMISO_COINUTILS_CONFIG_FILE_SETTINGS "#define COMISO_COINUTILS_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${COINUTILS_INCLUDE_DIRS} ) # list( APPEND COMISO_INCLUDE_DIRECTORIES ${COINUTILS_INCLUDE_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${COINUTILS_LIBRARIES} ) # list( APPEND COMISO_LINK_LIBRARIES ${COINUTILS_LIBRARIES} )
else () #else ()
message (STATUS "COINUTILS not found!") # message (STATUS "COINUTILS not found!")
set (COMISO_COINUTILS_CONFIG_FILE_SETTINGS "#define COMISO_COINUTILS_AVAILABLE 0" ) # set (COMISO_COINUTILS_CONFIG_FILE_SETTINGS "#define COMISO_COINUTILS_AVAILABLE 0" )
endif () #endif ()
find_package (OSI) #find_package (OSI)
if (OSI_FOUND ) #if (OSI_FOUND )
set (COMISO_OSI_CONFIG_FILE_SETTINGS "#define COMISO_OSI_AVAILABLE 1" ) # set (COMISO_OSI_CONFIG_FILE_SETTINGS "#define COMISO_OSI_AVAILABLE 1" )
list( APPEND COMISO_INCLUDE_DIRECTORIES ${OSI_INCLUDE_DIRS} ) # list( APPEND COMISO_INCLUDE_DIRECTORIES ${OSI_INCLUDE_DIRS} )
list( APPEND COMISO_LINK_LIBRARIES ${OSI_LIBRARIES} ) # list( APPEND COMISO_LINK_LIBRARIES ${OSI_LIBRARIES} )
else () #else ()
message (STATUS "OSI not found!") # message (STATUS "OSI not found!")
set (COMISO_OSI_CONFIG_FILE_SETTINGS "#define COMISO_OSI_AVAILABLE 0" ) # set (COMISO_OSI_CONFIG_FILE_SETTINGS "#define COMISO_OSI_AVAILABLE 0" )
endif () #endif ()
find_package (Taucs) find_package (Taucs)
set (SUPRESS_TAUCS OFF CACHE BOOL "Set to ON if CoMISo should be built without TAUCS.") set (SUPRESS_TAUCS OFF CACHE BOOL "Set to ON if CoMISo should be built without TAUCS.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment