Commit 0397317c authored by Jan Möbius's avatar Jan Möbius
Browse files

Updated finders

parent 171e2cdf
Pipeline #2336 failed with stage
in 15 minutes and 12 seconds
...@@ -34,21 +34,28 @@ include(CheckFunctionExists) ...@@ -34,21 +34,28 @@ include(CheckFunctionExists)
include(CGAL_GeneratorSpecificSettings) include(CGAL_GeneratorSpecificSettings)
# I8 Search paths for windows libraries
# Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif() endif()
# This macro checks for the existence of the combination of fortran libraries # This macro checks for the existence of the combination of fortran libraries
# given by _list. If the combination is found, this macro checks (using the # given by _list. If the combination is found, this macro checks (using the
# check_function_exists macro) whether can link against that library # check_function_exists macro) whether can link against that library
......
...@@ -4,16 +4,25 @@ ...@@ -4,16 +4,25 @@
# CBC_INCLUDE_DIRS - The CBC include directories # CBC_INCLUDE_DIRS - The CBC include directories
# CBC_LIBRARIES - The libraries needed to use CBC # CBC_LIBRARIES - The libraries needed to use CBC
# I8 Search paths for windows libraries
# Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif() endif()
......
# - Try to find CGL # - Try to find CGL
# Once done this will define # Once done this will define
# CGL_FOUND - System has CGL # CGL_FOUND - System has CGL
# CGL_INCLUDE_DIRS - The CGL include directories # CGL_INCLUDE_DIRS - The CGL include directories
# CGL_LIBRARIES - The libraries needed to use CGL # CGL_LIBRARIES - The libraries needed to use CGL
# I8 Search paths for windows libraries
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) # Check if the base path is set
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") if ( NOT CMAKE_WINDOWS_LIBS_DIR )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) # This is the base directory for windows library search used in the finders we shipp.
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) endif()
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-") if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
endif() SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
if ( NOT CGL_FOUND) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
find_path(CGL_INCLUDE_DIR SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
NAMES CglConfig.h elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
PATHS "$ENV{CGL_DIR}/include/coin" SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
"$ENV{CBC_DIR}/include/coin" elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
"/usr/include/coin" SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
"C:\\libs\\cgl\\include" endif()
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.7/Cgl/include" if ( NOT CGL_FOUND)
"${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
) find_path(CGL_INCLUDE_DIR
NAMES CglConfig.h
find_library( CGL_LIBRARY_DEBUG PATHS "$ENV{CGL_DIR}/include/coin"
NAMES Cgld libCgld "$ENV{CBC_DIR}/include/coin"
PATHS "$ENV{CGL_DIR}/lib" "/usr/include/coin"
"$ENV{CBC_DIR}/lib" "C:\\libs\\cgl\\include"
"/usr/lib" "C:\\libs\\cbc\\include"
"/usr/lib/coin" "${VS_SEARCH_PATH}CBC-2.9.7/Cgl/include"
"C:\\libs\\cgl\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
"C:\\libs\\cbc\\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_DEBUG
) NAMES Cgld libCgld
PATHS "$ENV{CGL_DIR}/lib"
find_library( CGL_LIBRARY_RELEASE "$ENV{CBC_DIR}/lib"
NAMES Cgl libCgl "/usr/lib"
PATHS "$ENV{CGL_DIR}/lib" "/usr/lib/coin"
"$ENV{CBC_DIR}/lib" "C:\\libs\\cgl\\lib"
"/usr/lib" "C:\\libs\\cbc\\lib"
"/usr/lib/coin" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"C:\\libs\\cgl\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/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" find_library( CGL_LIBRARY_RELEASE
) NAMES Cgl libCgl
PATHS "$ENV{CGL_DIR}/lib"
include(SelectLibraryConfigurations) "$ENV{CBC_DIR}/lib"
select_library_configurations( CGL ) "/usr/lib"
"/usr/lib/coin"
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" ) "C:\\libs\\cgl\\lib"
set(CGL_LIBRARIES "${CGL_LIBRARY}" ) "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(FindPackageHandleStandardArgs) )
# handle the QUIETLY and REQUIRED arguments and set CGL_FOUND to TRUE
# if all listed variables are TRUE include(SelectLibraryConfigurations)
find_package_handle_standard_args(CGL DEFAULT_MSG select_library_configurations( CGL )
CGL_LIBRARY CGL_INCLUDE_DIR)
set(CGL_INCLUDE_DIRS "${CGL_INCLUDE_DIR}" )
mark_as_advanced(CGL_INCLUDE_DIR CGL_LIBRARY) set(CGL_LIBRARIES "${CGL_LIBRARY}" )
endif(NOT CGL_FOUND)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set CGL_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(CGL DEFAULT_MSG
CGL_LIBRARY CGL_INCLUDE_DIR)
mark_as_advanced(CGL_INCLUDE_DIR CGL_LIBRARY)
endif(NOT CGL_FOUND)
# - Try to find CLP # - Try to find CLP
# Once done this will define # Once done this will define
# CLP_FOUND - System has CLP # CLP_FOUND - System has CLP
# CLP_INCLUDE_DIRS - The CLP include directories # CLP_INCLUDE_DIRS - The CLP include directories
# CLP_LIBRARIES - The libraries needed to use CLP # CLP_LIBRARIES - The libraries needed to use CLP
# I8 Search paths for windows libraries
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) # Check if the base path is set
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") if ( NOT CMAKE_WINDOWS_LIBS_DIR )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) # This is the base directory for windows library search used in the finders we shipp.
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) endif()
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/")
SET(VS_SUBDIR "x64-v120-") if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
endif() SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
if (NOT CLP_FOUND) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
find_path(CLP_INCLUDE_DIR SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
NAMES ClpConfig.h elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
PATHS "$ENV{CLP_DIR}/include/coin" SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
"$ENV{CBC_DIR}/include/coin" elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
"/usr/include/coin" SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
"C:\\libs\\clp\\include" endif()
"C:\\libs\\cbc\\include"
"${VS_SEARCH_PATH}CBC-2.9.7/Clp/include" if (NOT CLP_FOUND)
"${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
) find_path(CLP_INCLUDE_DIR
NAMES ClpConfig.h
find_library( CLP_LIBRARY_DEBUG PATHS "$ENV{CLP_DIR}/include/coin"
NAMES Clpd libClpd "$ENV{CBC_DIR}/include/coin"
PATHS "$ENV{CLP_DIR}/lib" "/usr/include/coin"
"$ENV{CBC_DIR}/lib" "C:\\libs\\clp\\include"
"/usr/lib" "C:\\libs\\cbc\\include"
"/usr/lib/coin" "${VS_SEARCH_PATH}CBC-2.9.7/Clp/include"
"C:\\libs\\clp\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
"C:\\libs\\cbc\\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_DEBUG
) NAMES Clpd libClpd
PATHS "$ENV{CLP_DIR}/lib"
find_library( CLP_LIBRARY_RELEASE "$ENV{CBC_DIR}/lib"
NAMES Clp libClp "/usr/lib"
PATHS "$ENV{CLP_DIR}/lib" "/usr/lib/coin"
"$ENV{CBC_DIR}/lib" "C:\\libs\\clp\\lib"
"/usr/lib" "C:\\libs\\cbc\\lib"
"/usr/lib/coin" "${VS_SEARCH_PATH}CBC-2.9.7/lib/${VS_SUBDIR}Debug"
"C:\\libs\\clp\\lib" "${VS_SEARCH_PATH}CBC-2.9.4/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" find_library( CLP_LIBRARY_RELEASE
) NAMES Clp libClp
PATHS "$ENV{CLP_DIR}/lib"
include(SelectLibraryConfigurations) "$ENV{CBC_DIR}/lib"
select_library_configurations( CLP ) "/usr/lib"
"/usr/lib/coin"
set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" ) "C:\\libs\\clp\\lib"
set(CLP_LIBRARIES "${CLP_LIBRARY}" ) "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(FindPackageHandleStandardArgs) )
# handle the QUIETLY and REQUIRED arguments and set CLP_FOUND to TRUE
# if all listed variables are TRUE include(SelectLibraryConfigurations)
find_package_handle_standard_args(CLP DEFAULT_MSG select_library_configurations( CLP )
CLP_LIBRARY CLP_INCLUDE_DIR)
set(CLP_INCLUDE_DIRS "${CLP_INCLUDE_DIR}" )
mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY) set(CLP_LIBRARIES "${CLP_LIBRARY}" )
endif(NOT CLP_FOUND)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set CLP_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(CLP DEFAULT_MSG
CLP_LIBRARY CLP_INCLUDE_DIR)
mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY)
endif( NOT CLP_FOUND)
...@@ -4,15 +4,25 @@ ...@@ -4,15 +4,25 @@
# COINUTILS_INCLUDE_DIRS - The COINUTILS include directories # COINUTILS_INCLUDE_DIRS - The COINUTILS include directories
# COINUTILS_LIBRARIES - The libraries needed to use COINUTILS # COINUTILS_LIBRARIES - The libraries needed to use COINUTILS
# I8 Search paths for windows libraries
# Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif() endif()
if ( NOT COINUTILS_FOUND ) if ( NOT COINUTILS_FOUND )
......
...@@ -9,6 +9,27 @@ if (EIGEN3_INCLUDE_DIR) ...@@ -9,6 +9,27 @@ if (EIGEN3_INCLUDE_DIR)
set(EIGEN3_INCLUDE_DIRS "${EIGEN3_INCLUDE_DIR}" ) set(EIGEN3_INCLUDE_DIRS "${EIGEN3_INCLUDE_DIR}" )
else (EIGEN3_INCLUDE_DIR) else (EIGEN3_INCLUDE_DIR)
# Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif()
find_path( EIGEN3_INCLUDE_DIR find_path( EIGEN3_INCLUDE_DIR
NAMES Eigen/Dense NAMES Eigen/Dense
PATHS $ENV{EIGEN_DIR} PATHS $ENV{EIGEN_DIR}
...@@ -16,8 +37,15 @@ find_path( EIGEN3_INCLUDE_DIR ...@@ -16,8 +37,15 @@ find_path( EIGEN3_INCLUDE_DIR
/usr/local/include /usr/local/include
/usr/local/include/eigen3/ /usr/local/include/eigen3/
/opt/local/include/eigen3/ /opt/local/include/eigen3/
"c:\\libs\\eigen3\\include" "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.8"
"c:\\libs\\eigen\\include" "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.6"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6/include"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.1"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.1/include"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2/include"
"${CMAKE_WINDOWS_LIBS_DIR}/eigen3/include"
"${CMAKE_WINDOWS_LIBS_DIR}/eigen/include"
${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include ${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include
../../External/include ../../External/include
${module_file_path}/../../../External/include ${module_file_path}/../../../External/include
......
...@@ -10,23 +10,30 @@ if (GMM_INCLUDE_DIR) ...@@ -10,23 +10,30 @@ if (GMM_INCLUDE_DIR)
set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" ) set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" )
else (GMM_INCLUDE_DIR) else (GMM_INCLUDE_DIR)
# Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
find_path( GMM_INCLUDE_DIR find_path( GMM_INCLUDE_DIR
NAMES gmm/gmm.h NAMES gmm/gmm.h
PATHS $ENV{GMM_DIR} PATHS $ENV{GMM_DIR}
/usr/include /usr/include
/usr/include /usr/include
/usr/local/include /usr/local/include
~/sw/gmm-4.3/include
~/sw/gmm-4.1/include ~/sw/gmm-4.1/include
"c:\\libs\\gmm-4.3\\include" "c:\\libs\\gmm-4.2\\include"
"c:\\libs\\gmm-4.1\\include" "c:\\libs\\gmm-4.1\\include"
"c:\\libs\\gmm-3.0\\include" "c:\\libs\\gmm-3.0\\include"
"${CMAKE_WINDOWS_LIBS_DIR}/general/gmm-5.0/include"
"${CMAKE_WINDOWS_LIBS_DIR}/general/gmm-4.2/include"
${PROJECT_SOURCE_DIR}/MacOS/Libs/gmm-3.1/include ${PROJECT_SOURCE_DIR}/MacOS/Libs/gmm-3.1/include
../../External/include ../../External/include
/ACG/acgdev/gcc-4.3-i686/gmm-4.1/include/ /ACG/acgdev/gcc-4.3-i686/gmm-4.1/include/
/ACG/acgdev/gcc-4.3-i686/gmm-3/include/ /ACG/acgdev/gcc-4.3-i686/gmm-3/include/
${module_file_path}/../../../External/include ${module_file_path}/../../../External/include
$ENV{HOME}/opt/gmm/gmm-4.2/include
) )
set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" ) set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" )
...@@ -34,10 +41,10 @@ set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" ) ...@@ -34,10 +41,10 @@ set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" )
# use c++ headers as default # use c++ headers as default
IF (WIN32) IF (WIN32)
set(GMM_COMPILER_FLAGS "-D_SCL_SECURE_NO_DEPRECATE" CACHE STRING "GMM Compiler Flags") set(GMM_COMPILE_DEFINITIONS "_SCL_SECURE_NO_DEPRECATE" CACHE STRING "GMM Compiler Definitions")
# add_definitions(-D_SCL_SECURE_NO_DEPRECATE) # add_definitions(-D_SCL_SECURE_NO_DEPRECATE)
ELSE(WIN32) ELSE(WIN32)
set(GMM_COMPILER_FLAGS "" CACHE STRING "GMM Compiler Flags") set(GMM_COMPILE_DEFINITIONS "" CACHE STRING "GMM Compiler Definitions")
ENDIF(WIN32) ENDIF(WIN32)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
...@@ -46,7 +53,7 @@ include(FindPackageHandleStandardArgs) ...@@ -46,7 +53,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GMM DEFAULT_MSG find_package_handle_standard_args(GMM DEFAULT_MSG
GMM_INCLUDE_DIR) GMM_INCLUDE_DIR)
mark_as_advanced(GMM_INCLUDE_DIR GMM_COMPILER_FLAGS) mark_as_advanced(GMM_INCLUDE_DIR GMM_COMPILE_DEFINITIONS)
endif(GMM_INCLUDE_DIR) endif(GMM_INCLUDE_DIR)
...@@ -19,17 +19,25 @@ if (WIN32) ...@@ -19,17 +19,25 @@ if (WIN32)
SET( DIRSUFFIX "lib" ) SET( DIRSUFFIX "lib" )
endif() endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 10.*" ) # Check if the base path is set
SET(VS_SEARCH_PATH "c:/libs/vs2010/x32/") if ( NOT CMAKE_WINDOWS_LIBS_DIR )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) # This is the base directory for windows library search used in the finders we shipp.
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) endif()
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
endif() elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif()
find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
PATHS PATHS
......
...@@ -34,18 +34,29 @@ include(CheckFunctionExists) ...@@ -34,18 +34,29 @@ include(CheckFunctionExists)
include(CGAL_GeneratorSpecificSettings) include(CGAL_GeneratorSpecificSettings)
# I8 Search paths for windows libraries # Check if the base path is set
if ( NOT CMAKE_WINDOWS_LIBS_DIR )
# This is the base directory for windows library search used in the finders we shipp.
set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
endif()
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2012/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
endif() endif()
# This macro checks for the existence of the combination of fortran libraries # This macro checks for the existence of the combination of fortran libraries