Commit ac7a3a2b authored by David Bommes's avatar David Bommes
Browse files

added standard search paths for dependencies installed with homebrew on Mac M1 architecture

parent e811b6b1
Pipeline #20880 failed with stages
in 12 minutes and 38 seconds
...@@ -32,9 +32,10 @@ endif() ...@@ -32,9 +32,10 @@ endif()
if (NOT CBC_FOUND ) if (NOT CBC_FOUND )
find_path(CBC_INCLUDE_DIR find_path(CBC_INCLUDE_DIR
NAMES CbcConfig.h NAMES CbcConfig.h
PATHS "$ENV{CBC_DIR}/include/coin" PATHS "$ENV{CBC_DIR}/include/coin"
"/opt/homebrew/include/cbc/coin/" # homebrew default path
"/usr/local/include/cbc/coin/" # homebrew default path "/usr/local/include/cbc/coin/" # homebrew default path
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\cbc\\include" "C:\\libs\\cbc\\include"
...@@ -45,6 +46,7 @@ find_path(CBC_INCLUDE_DIR ...@@ -45,6 +46,7 @@ find_path(CBC_INCLUDE_DIR
find_library( CBC_LIBRARY_DEBUG find_library( CBC_LIBRARY_DEBUG
NAMES Cbcd libCbcd NAMES Cbcd libCbcd
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -56,6 +58,7 @@ find_library( CBC_LIBRARY_DEBUG ...@@ -56,6 +58,7 @@ find_library( CBC_LIBRARY_DEBUG
find_library( CBC_SOLVER_LIBRARY_DEBUG find_library( CBC_SOLVER_LIBRARY_DEBUG
NAMES CbcSolverd libCbcSolverd NAMES CbcSolverd libCbcSolverd
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -67,6 +70,7 @@ find_library( CBC_SOLVER_LIBRARY_DEBUG ...@@ -67,6 +70,7 @@ find_library( CBC_SOLVER_LIBRARY_DEBUG
find_library( CBC_LIBRARY_RELEASE find_library( CBC_LIBRARY_RELEASE
NAMES Cbc libCbc NAMES Cbc libCbc
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -79,6 +83,7 @@ find_library( CBC_SOLVER_LIBRARY_RELEASE ...@@ -79,6 +83,7 @@ find_library( CBC_SOLVER_LIBRARY_RELEASE
NAMES CbcSolver libCbcSolver NAMES CbcSolver libCbcSolver
PATHS "$ENV{CBC_DIR}/lib" PATHS "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
......
...@@ -31,10 +31,11 @@ endif() ...@@ -31,10 +31,11 @@ endif()
if ( NOT CGL_FOUND) if ( NOT CGL_FOUND)
find_path(CGL_INCLUDE_DIR find_path(CGL_INCLUDE_DIR
NAMES CglConfig.h NAMES CglConfig.h
PATHS "$ENV{CGL_DIR}/include/coin" PATHS "$ENV{CGL_DIR}/include/coin"
"$ENV{CBC_DIR}/include/coin" "$ENV{CBC_DIR}/include/coin"
"/opt/homebrew/include/cgl/coin/" # homebrew default path
"/usr/local/include/cgl/coin/" # homebrew default path "/usr/local/include/cgl/coin/" # homebrew default path
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\cgl\\include" "C:\\libs\\cgl\\include"
...@@ -43,10 +44,11 @@ find_path(CGL_INCLUDE_DIR ...@@ -43,10 +44,11 @@ find_path(CGL_INCLUDE_DIR
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
) )
find_library( CGL_LIBRARY_DEBUG find_library( CGL_LIBRARY_DEBUG
NAMES Cgld libCgld NAMES Cgld libCgld
PATHS "$ENV{CGL_DIR}/lib" PATHS "$ENV{CGL_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -55,11 +57,12 @@ find_library( CGL_LIBRARY_DEBUG ...@@ -55,11 +57,12 @@ find_library( CGL_LIBRARY_DEBUG
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
) )
find_library( CGL_LIBRARY_RELEASE find_library( CGL_LIBRARY_RELEASE
NAMES Cgl libCgl NAMES Cgl libCgl
PATHS "$ENV{CGL_DIR}/lib" PATHS "$ENV{CGL_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -67,11 +70,11 @@ find_library( CGL_LIBRARY_RELEASE ...@@ -67,11 +70,11 @@ find_library( CGL_LIBRARY_RELEASE
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
) )
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
select_library_configurations( CGL ) select_library_configurations( CGL )
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" ) set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" )
set(CGL_LIBRARIES "${CGL_LIBRARY}" ) set(CGL_LIBRARIES "${CGL_LIBRARY}" )
......
...@@ -32,10 +32,11 @@ endif() ...@@ -32,10 +32,11 @@ endif()
if (NOT CLP_FOUND) if (NOT CLP_FOUND)
find_path(CLP_INCLUDE_DIR find_path(CLP_INCLUDE_DIR
NAMES ClpConfig.h NAMES ClpConfig.h
PATHS "$ENV{CLP_DIR}/include/coin" PATHS "$ENV{CLP_DIR}/include/coin"
"$ENV{CBC_DIR}/include/coin" "$ENV{CBC_DIR}/include/coin"
"/opt/homebrew/include/clp/coin" #homebrew default path
"/usr/local/include/clp/coin" #homebrew default path "/usr/local/include/clp/coin" #homebrew default path
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\clp\\include" "C:\\libs\\clp\\include"
...@@ -48,6 +49,7 @@ find_library( CLP_LIBRARY_DEBUG ...@@ -48,6 +49,7 @@ find_library( CLP_LIBRARY_DEBUG
NAMES Clpd libClpd NAMES Clpd libClpd
PATHS "$ENV{CLP_DIR}/lib" PATHS "$ENV{CLP_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -56,11 +58,12 @@ find_library( CLP_LIBRARY_DEBUG ...@@ -56,11 +58,12 @@ find_library( CLP_LIBRARY_DEBUG
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
) )
find_library( CLP_LIBRARY_RELEASE find_library( CLP_LIBRARY_RELEASE
NAMES Clp libClp NAMES Clp libClp
PATHS "$ENV{CLP_DIR}/lib" PATHS "$ENV{CLP_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -68,7 +71,7 @@ find_library( CLP_LIBRARY_RELEASE ...@@ -68,7 +71,7 @@ find_library( CLP_LIBRARY_RELEASE
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
) )
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
select_library_configurations( CLP ) select_library_configurations( CLP )
......
...@@ -31,10 +31,11 @@ endif() ...@@ -31,10 +31,11 @@ endif()
if ( NOT COINUTILS_FOUND ) if ( NOT COINUTILS_FOUND )
find_path(COINUTILS_INCLUDE_DIR find_path(COINUTILS_INCLUDE_DIR
NAMES CoinUtilsConfig.h NAMES CoinUtilsConfig.h
PATHS "$ENV{COINUTILS_DIR}/include/coin" PATHS "$ENV{COINUTILS_DIR}/include/coin"
"$ENV{CBC_DIR}/include/coin" "$ENV{CBC_DIR}/include/coin"
"/opt/homebrew/include/coinutils/coin/" # homebrew default path
"/usr/local/include/coinutils/coin/" # homebrew default path "/usr/local/include/coinutils/coin/" # homebrew default path
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\coinutils\\include" "C:\\libs\\coinutils\\include"
...@@ -47,6 +48,7 @@ find_library( COINUTILS_LIBRARY_DEBUG ...@@ -47,6 +48,7 @@ find_library( COINUTILS_LIBRARY_DEBUG
NAMES CoinUtilsd libCoinUtilsd NAMES CoinUtilsd libCoinUtilsd
PATHS "$ENV{COINUTILS_DIR}/lib" PATHS "$ENV{COINUTILS_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -55,11 +57,12 @@ find_library( COINUTILS_LIBRARY_DEBUG ...@@ -55,11 +57,12 @@ find_library( COINUTILS_LIBRARY_DEBUG
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib" "${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib"
) )
find_library( COINUTILS_LIBRARY_RELEASE find_library( COINUTILS_LIBRARY_RELEASE
NAMES CoinUtils libCoinUtils NAMES CoinUtils libCoinUtils
PATHS "$ENV{COINUTILS_DIR}/lib" PATHS "$ENV{COINUTILS_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib" # homebrew default path
"/usr/local/lib" # homebrew default path "/usr/local/lib" # homebrew default path
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
...@@ -67,8 +70,8 @@ find_library( COINUTILS_LIBRARY_RELEASE ...@@ -67,8 +70,8 @@ find_library( COINUTILS_LIBRARY_RELEASE
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib" "${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib"
) )
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
select_library_configurations( COINUTILS ) select_library_configurations( COINUTILS )
......
...@@ -42,7 +42,7 @@ if (WIN32) ...@@ -42,7 +42,7 @@ if (WIN32)
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
endif() endif()
find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
PATHS PATHS
"${VS_SEARCH_PATH}Ipopt-3.12.9/include/coin" "${VS_SEARCH_PATH}Ipopt-3.12.9/include/coin"
...@@ -53,26 +53,26 @@ if (WIN32) ...@@ -53,26 +53,26 @@ if (WIN32)
) )
IF(IPOPT_INCLUDE_DIR) IF(IPOPT_INCLUDE_DIR)
find_library( IPOPT_LIBRARY_RELEASE find_library( IPOPT_LIBRARY_RELEASE
Ipopt ipopt libipopt IpOpt-vc10 Ipopt ipopt libipopt IpOpt-vc10
PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\release" PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\release"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
"${VS_SEARCH_PATH}Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
find_library( IPOPT_LIBRARY_DEBUG find_library( IPOPT_LIBRARY_DEBUG
Ipopt ipoptd libipoptd IpOpt-vc10d Ipopt ipoptd libipoptd IpOpt-vc10d
PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\debug" PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\debug"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
"${VS_SEARCH_PATH}Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
set ( IPOPT_LIBRARY "optimized;${IPOPT_LIBRARY_RELEASE};debug;${IPOPT_LIBRARY_DEBUG}" CACHE STRING "IPOPT Libraries" ) set ( IPOPT_LIBRARY "optimized;${IPOPT_LIBRARY_RELEASE};debug;${IPOPT_LIBRARY_DEBUG}" CACHE STRING "IPOPT Libraries" )
GET_FILENAME_COMPONENT(IPOPT_LIBRARY_DIR ${IPOPT_LIBRARY_RELEASE} PATH ) GET_FILENAME_COMPONENT(IPOPT_LIBRARY_DIR ${IPOPT_LIBRARY_RELEASE} PATH )
MARK_AS_ADVANCED(IPOPT_LIBRARY_DIR) MARK_AS_ADVANCED(IPOPT_LIBRARY_DIR)
SET(IPOPT_FOUND TRUE) SET(IPOPT_FOUND TRUE)
SET(IPOPT_INCLUDE_DIRS ${IPOPT_INCLUDE_DIR}) SET(IPOPT_INCLUDE_DIRS ${IPOPT_INCLUDE_DIR})
...@@ -88,25 +88,27 @@ if (WIN32) ...@@ -88,25 +88,27 @@ if (WIN32)
ELSE( WIN32 ) ELSE( WIN32 )
find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
PATHS "$ENV{IPOPT_HOME}/include/coin" PATHS "$ENV{IPOPT_HOME}/include/coin"
"/opt/homebrew/include/coin-or" # homebrew M1 default path
"/usr/local/include/coin-or" # homebrew default path "/usr/local/include/coin-or" # homebrew default path
"/usr/include/coin" "/usr/include/coin"
"~/sw/Ipopt-3.12.4-installed/include/coin" "~/sw/Ipopt-3.12.4-installed/include/coin"
) )
find_library( IPOPT_LIBRARY find_library( IPOPT_LIBRARY
ipopt ipopt
HINTS "$ENV{IPOPT_HOME}/lib" HINTS "$ENV{IPOPT_HOME}/lib"
PATHS PATHS
"/usr/lib" "/usr/lib"
"/opt/homebrew/lib"
"~/sw/Ipopt-3.12.4-installed/lib" "~/sw/Ipopt-3.12.4-installed/lib"
) )
#wrong config under Debian workaround #wrong config under Debian workaround
add_definitions( -DHAVE_CSTDDEF ) add_definitions( -DHAVE_CSTDDEF )
# set optional path to HSL Solver for dynamic usage # set optional path to HSL Solver for dynamic usage
find_path(IPOPT_HSL_LIBRARY_DIR find_path(IPOPT_HSL_LIBRARY_DIR
NAMES libhsl.so NAMES libhsl.so
libhsl.dylib libhsl.dylib
HINTS "$ENV{IPOPT_HSL_LIBRARY_PATH}" HINTS "$ENV{IPOPT_HSL_LIBRARY_PATH}"
...@@ -114,13 +116,13 @@ ELSE( WIN32 ) ...@@ -114,13 +116,13 @@ ELSE( WIN32 )
) )
# find HSL library for fixed linking of solvers # find HSL library for fixed linking of solvers
find_library( IPOPT_HSL_LIBRARY find_library( IPOPT_HSL_LIBRARY
coinhsl hsl coinhsl hsl
HINTS "$ENV{IPOPT_HSL_LIBRARY_PATH}" HINTS "$ENV{IPOPT_HSL_LIBRARY_PATH}"
"$ENV{IPOPT_HOME}/lib" "$ENV{IPOPT_HOME}/lib"
PATHS "/usr/lib" ) PATHS "/usr/lib" )
set(IPOPT_LIBRARY_DIRS "${IPOPT_LIBRARY_DIR}" ) set(IPOPT_LIBRARY_DIRS "${IPOPT_LIBRARY_DIR}" )
set(IPOPT_INCLUDE_DIRS "${IPOPT_INCLUDE_DIR}" ) set(IPOPT_INCLUDE_DIRS "${IPOPT_INCLUDE_DIR}" )
set(IPOPT_LIBRARIES "${IPOPT_LIBRARY}" ) set(IPOPT_LIBRARIES "${IPOPT_LIBRARY}" )
...@@ -131,11 +133,11 @@ ELSE( WIN32 ) ...@@ -131,11 +133,11 @@ ELSE( WIN32 )
ENDIF() ENDIF()
LIST( APPEND IPOPT_LIBRARY_DIRS "${IPOPT_HSL_LIBRARY_DIR}") LIST( APPEND IPOPT_LIBRARY_DIRS "${IPOPT_HSL_LIBRARY_DIR}")
ENDIF(IPOPT_HSL_LIBRARY_DIR) ENDIF(IPOPT_HSL_LIBRARY_DIR)
IF(IPOPT_HSL_LIBRARY) IF(IPOPT_HSL_LIBRARY)
LIST( APPEND IPOPT_LIBRARIES "${IPOPT_HSL_LIBRARY}") LIST( APPEND IPOPT_LIBRARIES "${IPOPT_HSL_LIBRARY}")
ENDIF(IPOPT_HSL_LIBRARY) ENDIF(IPOPT_HSL_LIBRARY)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
...@@ -145,5 +147,5 @@ ELSE( WIN32 ) ...@@ -145,5 +147,5 @@ ELSE( WIN32 )
IPOPT_LIBRARY IPOPT_INCLUDE_DIR) IPOPT_LIBRARY IPOPT_INCLUDE_DIR)
mark_as_advanced(IPOPT_INCLUDE_DIR IPOPT_LIBRARY ) mark_as_advanced(IPOPT_INCLUDE_DIR IPOPT_LIBRARY )
ENDIF() ENDIF()
...@@ -34,7 +34,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" ) ...@@ -34,7 +34,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
endif() endif()
find_path(MUMPS_INCLUDE_DIR find_path(MUMPS_INCLUDE_DIR
NAMES mumps.h dmumps_c.h NAMES mumps.h dmumps_c.h
HINTS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/" HINTS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
"$ENV{IPOPT_HOME}/include/coin/ThirdParty" "$ENV{IPOPT_HOME}/include/coin/ThirdParty"
...@@ -42,26 +42,28 @@ find_path(MUMPS_INCLUDE_DIR ...@@ -42,26 +42,28 @@ find_path(MUMPS_INCLUDE_DIR
"${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps" "${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps"
) )
find_library( MUMPS_LIBRARY_DEBUG find_library( MUMPS_LIBRARY_DEBUG
coinmumpsd dmumpsd coinmumpscd coinmumpsd dmumpsd coinmumpscd
HINTS "$ENV{IPOPT_HOME}/lib/" HINTS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" "/usr/lib"
"/opt/homebrew/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
find_library( MUMPS_LIBRARY_RELEASE find_library( MUMPS_LIBRARY_RELEASE
coinmumps dmumps coinmumpsc coinmumps dmumps coinmumpsc
HINTS "$ENV{IPOPT_HOME}/lib/" HINTS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" "/usr/lib"
"/opt/homebrew/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
select_library_configurations( MUMPS ) select_library_configurations( MUMPS )
set(MUMPS_INCLUDE_DIRS "${MUMPS_INCLUDE_DIR}" ) set(MUMPS_INCLUDE_DIRS "${MUMPS_INCLUDE_DIR}" )
set(MUMPS_LIBRARIES "${MUMPS_LIBRARY}" ) set(MUMPS_LIBRARIES "${MUMPS_LIBRARY}" )
......
...@@ -31,11 +31,12 @@ endif() ...@@ -31,11 +31,12 @@ endif()
if (NOT OSI_FOUND ) if (NOT OSI_FOUND )
find_path(OSI_INCLUDE_DIR find_path(OSI_INCLUDE_DIR
NAMES OsiConfig.h NAMES OsiConfig.h
PATH_SUFFIXES "Osi" PATH_SUFFIXES "Osi"
PATHS "$ENV{OSI_DIR}/include/coin" PATHS "$ENV{OSI_DIR}/include/coin"
"$ENV{CBC_DIR}/include/coin" "$ENV{CBC_DIR}/include/coin"
"/opt/homebrew/include/osi/coin" # homebrew default path
"/usr/local/include/osi/coin" # homebrew default path "/usr/local/include/osi/coin" # homebrew default path
"/usr/include/coin" "/usr/include/coin"
"C:\\libs\\osi\\include" "C:\\libs\\osi\\include"
...@@ -44,10 +45,11 @@ find_path(OSI_INCLUDE_DIR ...@@ -44,10 +45,11 @@ find_path(OSI_INCLUDE_DIR
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/include" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/include"
) )
find_library( OSI_LIBRARY_DEBUG find_library( OSI_LIBRARY_DEBUG
NAMES Osid libOsid NAMES Osid libOsid
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
...@@ -55,23 +57,25 @@ find_library( OSI_LIBRARY_DEBUG ...@@ -55,23 +57,25 @@ find_library( OSI_LIBRARY_DEBUG
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_LIBRARY_RELEASE find_library( OSI_LIBRARY_RELEASE
NAMES Osi libOsi NAMES Osi libOsi
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_CBC_LIBRARY_DEBUG find_library( OSI_CBC_LIBRARY_DEBUG
NAMES OsiCbcd libOsiCbcd NAMES OsiCbcd libOsiCbcd
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
...@@ -79,23 +83,25 @@ find_library( OSI_CBC_LIBRARY_DEBUG ...@@ -79,23 +83,25 @@ find_library( OSI_CBC_LIBRARY_DEBUG
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_CBC_LIBRARY_RELEASE find_library( OSI_CBC_LIBRARY_RELEASE
NAMES OsiCbc libOsiCbc NAMES OsiCbc libOsiCbc
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib"
"/usr/lib" "/usr/lib"
"/usr/lib/coin" "/usr/lib/coin"
"C:\\libs\\OSI\\lib" "C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib" "C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib" "${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
) )
find_library( OSI_CLP_LIBRARY_DEBUG find_library( OSI_CLP_LIBRARY_DEBUG
NAMES OsiClpd libOsiClpd NAMES OsiClpd libOsiClpd
PATHS "$ENV{OSI_DIR}/lib" PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib" "$ENV{CBC_DIR}/lib"
"/opt/homebrew/lib"