Commit 91168439 authored by Jan Möbius's avatar Jan Möbius

Updated finders for ipopt cbc mumps and metis like in comiso and igm

parent 05db4849
Pipeline #864 passed with stage
......@@ -11,10 +11,13 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
if (CBC_INCLUDE_DIR)
# in cache already
set(CBC_FOUND TRUE)
......@@ -23,12 +26,13 @@ if (CBC_INCLUDE_DIR)
else (CBC_INCLUDE_DIR)
find_path(CBC_INCLUDE_DIR
find_path(CBC_INCLUDE_DIR
NAMES CbcConfig.h
PATHS "$ENV{CBC_DIR}/include/coin"
"/usr/include/coin"
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/include"
"${VS_SEARCH_PATH}CBC-2.9.7/Cbc/include"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/include"
)
find_library( CBC_LIBRARY_DEBUG
......@@ -37,17 +41,18 @@ find_library( CBC_LIBRARY_DEBUG
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
)
find_library( CBC_SOLVER_LIBRARY_DEBUG
NAMES CbcSolverd libCbcSolverd
PATHS "$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
)
find_library( CBC_LIBRARY_RELEASE
......@@ -56,7 +61,8 @@ find_library( CBC_LIBRARY_RELEASE
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
)
find_library( CBC_SOLVER_LIBRARY_RELEASE
......@@ -66,13 +72,14 @@ find_library( CBC_SOLVER_LIBRARY_RELEASE
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Cbc/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( CBC_LIBRARY )
select_library_configurations( CBC_SOLVER_LIBRARY )
select_library_configurations( CBC )
select_library_configurations( CBC_SOLVER )
set(CBC_INCLUDE_DIRS "${CBC_INCLUDE_DIR}" )
set(CBC_LIBRARIES "${CBC_LIBRARY};${CBC_SOLVER_LIBRARY}" )
......
......@@ -11,6 +11,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
......@@ -29,20 +30,37 @@ find_path(CGL_INCLUDE_DIR
"/usr/include/coin"
"C:\\libs\\cgl\\include"
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
)
"${VS_SEARCH_PATH}CBC-2.9.7/Cgl/include"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
)
find_library( CGL_LIBRARY
NAMES Cgl libCgl
find_library( CGL_LIBRARY_DEBUG
NAMES Cgld libCgld
PATHS "$ENV{CGL_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cgl\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
)
find_library( CGL_LIBRARY_RELEASE
NAMES Cgl libCgl
PATHS "$ENV{CGL_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\cgl\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( CGL )
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" )
set(CGL_LIBRARIES "${CGL_LIBRARY}" )
......
......@@ -12,6 +12,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
......@@ -30,19 +31,36 @@ find_path(CLP_INCLUDE_DIR
"/usr/include/coin"
"C:\\libs\\clp\\include"
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
)
"${VS_SEARCH_PATH}CBC-2.9.7/Clp/include"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
)
find_library( CLP_LIBRARY
NAMES Clp libClp
find_library( CLP_LIBRARY_DEBUG
NAMES Clpd libClpd
PATHS "$ENV{CLP_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\clp\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
)
find_library( CLP_LIBRARY_RELEASE
NAMES Clp libClp
PATHS "$ENV{CLP_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\clp\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( CLP )
set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" )
set(CLP_LIBRARIES "${CLP_LIBRARY}" )
......
......@@ -29,19 +29,37 @@ find_path(COINUTILS_INCLUDE_DIR
"/usr/include/coin"
"C:\\libs\\coinutils\\include"
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/include"
"${VS_SEARCH_PATH}CBC-2.9.7/CoinUtils/include"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/include"
)
find_library( COINUTILS_LIBRARY
NAMES CoinUtils libCoinUtils
find_library( COINUTILS_LIBRARY_DEBUG
NAMES CoinUtilsd libCoinUtilsd
PATHS "$ENV{COINUTILS_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\coinutils\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib"
)
find_library( COINUTILS_LIBRARY_RELEASE
NAMES CoinUtils libCoinUtils
PATHS "$ENV{COINUTILS_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\coinutils\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/CoinUtils/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( COINUTILS )
set(COINUTILS_INCLUDE_DIRS "${COINUTILS_INCLUDE_DIR}" )
set(COINUTILS_LIBRARIES "${COINUTILS_LIBRARY}" )
......
......@@ -33,6 +33,7 @@ if (WIN32)
find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
PATHS
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/coin"
"${VS_SEARCH_PATH}Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/include/coin"
"C:\\libs\\Ipopt-3.8.2\\include\\coin"
${IPOPT_DIR}/include
......@@ -42,13 +43,15 @@ if (WIN32)
find_library( IPOPT_LIBRARY_RELEASE
Ipopt ipopt libipopt IpOpt-vc10
PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\release"
"${VS_SEARCH_PATH}Ipopt-3.11.9/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"
)
find_library( IPOPT_LIBRARY_DEBUG
Ipopt ipopt libipopt IpOpt-vc10
Ipopt ipoptd libipoptd IpOpt-vc10d
PATHS "C:\\libs\\Ipopt-3.8.2\\lib\\win32\\debug"
"${VS_SEARCH_PATH}Ipopt-3.11.9/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"
)
set ( IPOPT_LIBRARY "optimized;${IPOPT_LIBRARY_RELEASE};debug;${IPOPT_LIBRARY_DEBUG}" CACHE STRING "IPOPT Libraries" )
......
......@@ -10,37 +10,18 @@ if (METIS_INCLUDE_DIR)
SET(METIS_FIND_QUIETLY TRUE)
endif (METIS_INCLUDE_DIR)
if ( WIN32 )
# I8 Search paths for windows libraries
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
if ( CMAKE_GENERATOR MATCHES ".*Win64" )
SET( DIRSUFFIX "lib64" )
else ()
SET( DIRSUFFIX "lib" )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 10.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2010/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
find_path(METIS_INCLUDE_DIR NAMES metis.h
PATHS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
"${VS_SEARCH_PATH}suitesparse-metis-for-windows-1.2.2-install/include/"
)
find_library( METIS_LIBRARY
metis metis
PATHS "${VS_SEARCH_PATH}suitesparse-metis-for-windows-1.2.2-install/${DIRSUFFIX}" )
else(WIN32)
find_path(METIS_INCLUDE_DIR NAMES metis.h
PATHS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
......@@ -48,17 +29,27 @@ find_path(METIS_INCLUDE_DIR NAMES metis.h
"/usr/include/metis"
"/opt/local/include"
"/opt/local/include/metis"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis"
)
find_library( METIS_LIBRARY
find_library( METIS_LIBRARY_RELEASE
metis coinmetis
PATHS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib"
"/opt/local/lib" )
endif()
"/opt/local/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
find_library( METIS_LIBRARY_DEBUG
metisd coinmetisd
PATHS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib"
"/opt/local/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( METIS )
set(METIS_INCLUDE_DIRS "${METIS_INCLUDE_DIR}" )
set(METIS_LIBRARIES "${METIS_LIBRARY}" )
......
......@@ -10,17 +10,41 @@ if (MUMPS_INCLUDE_DIR)
SET(MUMPS_FIND_QUIETLY TRUE)
endif (MUMPS_INCLUDE_DIR)
# I8 Search paths for windows libraries
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
PATHS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
"/usr/include/"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps/include/"
)
find_library( MUMPS_LIBRARY
dmumps coinmumps
find_library( MUMPS_LIBRARY_DEBUG
dmumpsd coinmumpsd coinmumpscd
PATHS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
find_library( MUMPS_LIBRARY_RELEASE
dmumps coinmumps coinmumpsc
PATHS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" )
"/usr/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( MUMPS )
set(MUMPS_INCLUDE_DIRS "${MUMPS_INCLUDE_DIR}" )
set(MUMPS_LIBRARIES "${MUMPS_LIBRARY}" )
......
......@@ -11,6 +11,7 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/")
endif()
......@@ -31,42 +32,93 @@ find_path(OSI_INCLUDE_DIR
"/usr/include/coin"
"C:\\libs\\osi\\include"
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/include"
)
"${VS_SEARCH_PATH}CBC-2.9.7/Osi/include"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/include"
)
find_library( OSI_LIBRARY
NAMES Osi libOsi
find_library( OSI_LIBRARY_DEBUG
NAMES Osid libOsid
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
find_library( OSI_LIBRARY_RELEASE
NAMES Osi libOsi
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
find_library( OSI_CBC_LIBRARY
NAMES OsiCbc libOsiCbc
find_library( OSI_CBC_LIBRARY_DEBUG
NAMES OsiCbcd libOsiCbcd
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
find_library( OSI_CBC_LIBRARY_RELEASE
NAMES OsiCbc libOsiCbc
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
find_library( OSI_CLP_LIBRARY
NAMES OsiClp libOsiClp
find_library( OSI_CLP_LIBRARY_DEBUG
NAMES OsiClpd libOsiClpd
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
find_library( OSI_CLP_LIBRARY_RELEASE
NAMES OsiClp libOsiClp
PATHS "$ENV{OSI_DIR}/lib"
"$ENV{CBC_DIR}/lib"
"/usr/lib"
"/usr/lib/coin"
"C:\\libs\\OSI\\lib"
"C:\\libs\\cbc\\lib"
"${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Release"
"${VS_SEARCH_PATH}CBC-2.9.4/Osi/lib"
)
include(SelectLibraryConfigurations)
select_library_configurations( OSI )
select_library_configurations( OSI_CBC )
select_library_configurations( OSI_CLP )
set(OSI_INCLUDE_DIRS "${OSI_INCLUDE_DIR}" )
set(OSI_LIBRARIES "${OSI_LIBRARY};${OSI_CBC_LIBRARY};${OSI_CLP_LIBRARY}" )
......
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