From 4bcf205053392e67ebaf57bc2dcc21006f6b3ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 26 Apr 2016 15:28:30 +0200 Subject: [PATCH 1/5] Add cmake flag to set library dir for search path base, added vs2015 search paths --- CMakeLists.txt | 5 + cmake/FindASSIMP.cmake | 32 ++-- cmake/FindBLAS.cmake | 23 ++- cmake/FindCBC.cmake | 21 ++- cmake/FindCGL.cmake | 21 ++- cmake/FindCLP.cmake | 21 ++- cmake/FindCOINUTILS.cmake | 20 ++- cmake/FindFLANN.cmake | 19 +- cmake/FindGLEW.cmake | 38 ++-- cmake/FindGLUT.cmake | 23 ++- cmake/FindIPOPT.cmake | 30 ++-- cmake/FindLAPACK.cmake | 21 ++- cmake/FindMETIS.cmake | 20 ++- cmake/FindMUMPS.cmake | 20 ++- cmake/FindOSI.cmake | 20 ++- cmake/FindQwt6.cmake | 21 ++- cmake/FindSUITESPARSE.cmake | 350 ++++++++++++++++++------------------ 17 files changed, 426 insertions(+), 279 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc768e91b..a7094c919 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required (VERSION 2.8.9) +if ( WIN32 ) + # 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 (NOT CMAKE_BUILD_TYPE) message(STATUS "No build type selected, default to Release") set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) diff --git a/cmake/FindASSIMP.cmake b/cmake/FindASSIMP.cmake index 322ec89b4..227206d27 100644 --- a/cmake/FindASSIMP.cmake +++ b/cmake/FindASSIMP.cmake @@ -25,17 +25,25 @@ if( WIN32 ) SET( DIRSUFFIX "x86" ) 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() + # 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 the headers FIND_PATH( ASSIMP_INCLUDE_DIR assimp/scene.h @@ -48,7 +56,7 @@ if( WIN32 ) FIND_LIBRARY( ASSIMP_LIBRARY NAMES assimp PATH_SUFFIXES ${DIRSUFFIX} - PATHS "C:/libs/assimp/lib" + PATHS "${CMAKE_WINDOWS_LIBS_DIR}/assimp/lib" "${VS_SEARCH_PATH}assimp/lib" "C:/Program Files/Assimp/lib" ) diff --git a/cmake/FindBLAS.cmake b/cmake/FindBLAS.cmake index 16ad81825..390a07aa7 100755 --- a/cmake/FindBLAS.cmake +++ b/cmake/FindBLAS.cmake @@ -34,21 +34,28 @@ include(CheckFunctionExists) 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" ) - 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.*" ) - 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" ) - 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.*" ) - 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() - - - # 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 # check_function_exists macro) whether can link against that library diff --git a/cmake/FindCBC.cmake b/cmake/FindCBC.cmake index 408bee4e6..8abe205c1 100644 --- a/cmake/FindCBC.cmake +++ b/cmake/FindCBC.cmake @@ -4,16 +4,25 @@ # CBC_INCLUDE_DIRS - The CBC include directories # 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() diff --git a/cmake/FindCGL.cmake b/cmake/FindCGL.cmake index c2245f5b2..e0f943473 100644 --- a/cmake/FindCGL.cmake +++ b/cmake/FindCGL.cmake @@ -4,16 +4,25 @@ # CGL_INCLUDE_DIRS - The CGL include directories # CGL_LIBRARIES - The libraries needed to use CGL -# 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() if ( NOT CGL_FOUND) diff --git a/cmake/FindCLP.cmake b/cmake/FindCLP.cmake index 2c8a38631..a52160577 100644 --- a/cmake/FindCLP.cmake +++ b/cmake/FindCLP.cmake @@ -5,16 +5,25 @@ # CLP_LIBRARIES - The libraries needed to use CLP -# 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() if (NOT CLP_FOUND) diff --git a/cmake/FindCOINUTILS.cmake b/cmake/FindCOINUTILS.cmake index ab6695781..dfc0ff2bb 100644 --- a/cmake/FindCOINUTILS.cmake +++ b/cmake/FindCOINUTILS.cmake @@ -4,15 +4,25 @@ # COINUTILS_INCLUDE_DIRS - The COINUTILS include directories # 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" ) - 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.*" ) - 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" ) - 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.*" ) - 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() if ( NOT COINUTILS_FOUND ) diff --git a/cmake/FindFLANN.cmake b/cmake/FindFLANN.cmake index 988666845..15dd730b4 100644 --- a/cmake/FindFLANN.cmake +++ b/cmake/FindFLANN.cmake @@ -26,14 +26,25 @@ if( FLANN_INCLUDE_DIR ) ELSEIF(WIN32) + + # 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 "c:/libs/vs2012/x64/") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") 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" ) - 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.*" ) - 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() diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index 0387a9f64..2668776f3 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -14,15 +14,25 @@ ENDIF (GLEW_INCLUDE_DIR) if( WIN32 ) - 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/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") - endif() + # 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() if( MSVC80 ) set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ 8/VC" ) @@ -32,18 +42,16 @@ if( WIN32 ) endif( MSVC71 ) FIND_PATH( GLEW_INCLUDE_DIR gl/glew.h gl/wglew.h - PATHS "c:/glew/include" - "c:/libs/glew/include" - "c:/libs/glew-1.6.0/include" + PATHS "${CMAKE_WINDOWS_LIBS_DIR}/glew/include" + "${CMAKE_WINDOWS_LIBS_DIR}/glew-1.6.0/include" ${COMPILER_PATH}/PlatformSDK/Include "${VS_SEARCH_PATH}glew-1.10.0/include") SET( GLEW_NAMES glew32 ) FIND_LIBRARY( GLEW_LIBRARY NAMES ${GLEW_NAMES} - PATHS "c:/glew/lib" - "c:/libs/glew/lib" - "c:/libs/glew-1.6.0/lib" + PATHS "${CMAKE_WINDOWS_LIBS_DIR}/glew/lib" + "${CMAKE_WINDOWS_LIBS_DIR}/glew-1.6.0/lib" ${COMPILER_PATH}/PlatformSDK/Lib "${VS_SEARCH_PATH}glew-1.10.0/lib" ) diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake index d70379821..6cbaec723 100644 --- a/cmake/FindGLUT.cmake +++ b/cmake/FindGLUT.cmake @@ -22,26 +22,37 @@ IF (WIN32) + # 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 "c:/libs/vs2012/x64/") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") 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" ) - 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.*" ) - 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() + FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h PATHS ${GLUT_ROOT_PATH}/include - "C:/libs/glut-3.7/include" + "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/include" "${VS_SEARCH_PATH}/freeglut-2.8.1/include" ) FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut32 glut freeglut PATHS ${OPENGL_LIBRARY_DIR} ${GLUT_ROOT_PATH}/Release - "C:/libs/glut-3.7/lib" + "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/lib" "${VS_SEARCH_PATH}/freeglut-2.8.1/lib" ) diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake index 54876ae60..2ca0652c1 100644 --- a/cmake/FindIPOPT.cmake +++ b/cmake/FindIPOPT.cmake @@ -19,17 +19,25 @@ if (WIN32) 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() + # 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(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp PATHS diff --git a/cmake/FindLAPACK.cmake b/cmake/FindLAPACK.cmake index d601c2707..181fbae1e 100755 --- a/cmake/FindLAPACK.cmake +++ b/cmake/FindLAPACK.cmake @@ -34,18 +34,29 @@ include(CheckFunctionExists) 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" ) - 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.*" ) - 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" ) - 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.*" ) - 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() + + # 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 # check_function_exists macro) whether can link against that library diff --git a/cmake/FindMETIS.cmake b/cmake/FindMETIS.cmake index 4aa17fa7c..961e1bf67 100644 --- a/cmake/FindMETIS.cmake +++ b/cmake/FindMETIS.cmake @@ -10,16 +10,24 @@ if (METIS_INCLUDE_DIR) SET(METIS_FIND_QUIETLY TRUE) endif (METIS_INCLUDE_DIR) -# 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() diff --git a/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake index d136f28a2..d9d759e0b 100644 --- a/cmake/FindMUMPS.cmake +++ b/cmake/FindMUMPS.cmake @@ -10,16 +10,24 @@ if (MUMPS_INCLUDE_DIR) SET(MUMPS_FIND_QUIETLY TRUE) endif (MUMPS_INCLUDE_DIR) -# 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h diff --git a/cmake/FindOSI.cmake b/cmake/FindOSI.cmake index 84556641f..7702cb04b 100644 --- a/cmake/FindOSI.cmake +++ b/cmake/FindOSI.cmake @@ -4,16 +4,24 @@ # OSI_INCLUDE_DIRS - The OSI include directories # OSI_LIBRARIES - The libraries needed to use OSI -# 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" ) - 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.*" ) - 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" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x64/") - SET(VS_SUBDIR "x64-v120-") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/") 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() diff --git a/cmake/FindQwt6.cmake b/cmake/FindQwt6.cmake index dc719bf13..c557102f7 100644 --- a/cmake/FindQwt6.cmake +++ b/cmake/FindQwt6.cmake @@ -7,19 +7,26 @@ +# 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 "c:/libs/vs2012/x64/") + SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") 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" ) - 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.*" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") -else () - SET(VS_SEARCH_PATH "") + 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() - if (QT5_FOUND) if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.5.1" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5") diff --git a/cmake/FindSUITESPARSE.cmake b/cmake/FindSUITESPARSE.cmake index 1647497ae..3b99b9352 100644 --- a/cmake/FindSUITESPARSE.cmake +++ b/cmake/FindSUITESPARSE.cmake @@ -1,170 +1,180 @@ -# - Try to find SUITESPARSE -# Once done this will define -# -# SUITESPARSE_FOUND - system has SUITESPARSE -# SUITESPARSE_INCLUDE_DIRS - the SUITESPARSE include directory -# SUITESPARSE_LIBRARIES - Link these to use SUITESPARSE -# SUITESPARSE_SPQR_LIBRARY - name of spqr library (necessary due to error in debian package) -# SUITESPARSE_SPQR_LIBRARY_DIR - name of spqr library (necessary due to error in debian package) -# SUITESPARSE_LIBRARY_DIR - Library main directory containing suitesparse libs -# SUITESPARSE_LIBRARY_DIRS - all Library directories containing suitesparse libs -# SUITESPARSE_SPQR_VALID - automatic identification whether or not spqr package is installed correctly - -IF (SUITESPARSE_INCLUDE_DIRS) - # Already in cache, be silent - SET(SUITESPARSE_FIND_QUIETLY TRUE) -ENDIF (SUITESPARSE_INCLUDE_DIRS) - -if( WIN32 ) - # Find cholmod part of the suitesparse library collection - - 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/") - elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" ) - SET(VS_SEARCH_PATH "c:/libs/vs2013/x32/") - endif() - - - FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h - PATHS "C:\\libs\\win32\\SuiteSparse\\Include" - "${VS_SEARCH_PATH}" - PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse - suitesparse-metis-for-windows-1.2.2-install/include/suitesparse - ) - - # Add cholmod include directory to collection include directories - IF ( CHOLMOD_INCLUDE_DIR ) - list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) - ENDIF( CHOLMOD_INCLUDE_DIR ) - - - # find path suitesparse library - FIND_PATH( SUITESPARSE_LIBRARY_DIRS - NAMES amd.lib libamd.lib - PATHS "C:\\libs\\win32\\SuiteSparse\\libs" - "${VS_SEARCH_PATH}" - PATH_SUFFIXES suitesparse-4.2.1/lib64 - suitesparse-metis-for-windows-1.2.2-install/lib64 ) - - # if we found the library, add it to the defined libraries - IF ( SUITESPARSE_LIBRARY_DIRS ) - if ( EXISTS "${SUITESPARSE_LIBRARY_DIRS}/libamd.lib" ) - list ( APPEND SUITESPARSE_LIBRARIES optimized;libamd;optimized;libcamd;optimized;libccolamd;optimized;libcholmod;optimized;libcolamd;optimized;metis;optimized;libspqr;optimized;libumfpack;debug;libamdd;debug;libcamdd;debug;libccolamdd;debug;libcholmodd;debug;libspqrd;debug;libumfpackd;debug;libcolamdd;debug;metisd;optimized;liblapack;debug;liblapackd;optimized;suitesparseconfig;debug;suitesparseconfigd ) - else() - list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;libf2c;optimized;lapack;debug;blasd;debug;libf2cd;debug;lapackd ) - endif() - - if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp") - SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid") - else() - SET(SUITESPARSE_SPQR_VALID FALSE CACHE BOOL "SuiteSparseSPQR valid") - endif() - - if(SUITESPARSE_SPQR_VALID) - FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY - NAMES libspqr - PATHS ${SUITESPARSE_LIBRARY_DIRS} ) - IF (SUITESPARSE_SPQR_LIBRARY) - list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd) - ENDIF (SUITESPARSE_SPQR_LIBRARY) - endif() - - - ENDIF( SUITESPARSE_LIBRARY_DIRS ) - -else( WIN32 ) - IF( APPLE) - FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h - PATHS /opt/local/include/ufsparse ) - - FIND_PATH( SUITESPARSE_LIBRARY_DIR - NAMES libSuiteSparse.dylib - PATHS /opt/local/lib ) - - list ( APPEND SUITESPARSE_LIBRARY_DIRS ${SUITESPARSE_LIBRARY_DIR} ) - - list ( APPEND SUITESPARSE_LIBRARIES SuiteSparse) - - ELSE(APPLE) - FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h - PATHS /usr/local/include - /usr/include - /usr/include/suitesparse/ - ${CMAKE_SOURCE_DIR}/MacOS/Libs/cholmod - PATH_SUFFIXES cholmod/ CHOLMOD/ ) - - - FIND_PATH( SUITESPARSE_LIBRARY_DIR - NAMES libcholmod.so - PATHS /usr/lib - /usr/lib64 - /usr/local/lib - /usr/lib/x86_64-linux-gnu ) - - - ENDIF(APPLE) - - # Add cholmod include directory to collection include directories - IF ( CHOLMOD_INCLUDE_DIR ) - list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) - ENDIF( CHOLMOD_INCLUDE_DIR ) - - - # if we found the library, add it to the defined libraries - IF ( SUITESPARSE_LIBRARY_DIR ) - - # Skipped, as this is set for apple in the block above -# if (NOT APPLE) - list ( APPEND SUITESPARSE_LIBRARIES amd) - list ( APPEND SUITESPARSE_LIBRARIES btf) - list ( APPEND SUITESPARSE_LIBRARIES camd) - list ( APPEND SUITESPARSE_LIBRARIES ccolamd) - list ( APPEND SUITESPARSE_LIBRARIES cholmod) - list ( APPEND SUITESPARSE_LIBRARIES colamd) - # list ( APPEND SUITESPARSE_LIBRARIES csparse) - list ( APPEND SUITESPARSE_LIBRARIES cxsparse) - list ( APPEND SUITESPARSE_LIBRARIES klu) - # list ( APPEND SUITESPARSE_LIBRARIES spqr) - list ( APPEND SUITESPARSE_LIBRARIES umfpack) - # endif() - - # Metis and spqr are optional - FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY - NAMES metis - PATHS ${SUITESPARSE_LIBRARY_DIR} ) - IF (SUITESPARSE_METIS_LIBRARY) - list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY}) - ENDIF(SUITESPARSE_METIS_LIBRARY) - - if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp") - SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid") - else() - SET(SUITESPARSE_SPQR_VALID false CACHE BOOL "SuiteSparseSPQR valid") - endif() - - if(SUITESPARSE_SPQR_VALID) - FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY - NAMES spqr - PATHS ${SUITESPARSE_LIBRARY_DIR} ) - IF (SUITESPARSE_SPQR_LIBRARY) - list ( APPEND SUITESPARSE_LIBRARIES spqr) - ENDIF (SUITESPARSE_SPQR_LIBRARY) - endif() - - ENDIF( SUITESPARSE_LIBRARY_DIR ) - -endif( WIN32 ) - -IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) - IF(WIN32) - list (APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR}/../../UFconfig ) - ENDIF(WIN32) - SET(SUITESPARSE_FOUND TRUE) -ELSE (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) - SET( SUITESPARSE_FOUND FALSE ) -ENDIF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) - +# - Try to find SUITESPARSE +# Once done this will define +# +# SUITESPARSE_FOUND - system has SUITESPARSE +# SUITESPARSE_INCLUDE_DIRS - the SUITESPARSE include directory +# SUITESPARSE_LIBRARIES - Link these to use SUITESPARSE +# SUITESPARSE_SPQR_LIBRARY - name of spqr library (necessary due to error in debian package) +# SUITESPARSE_SPQR_LIBRARY_DIR - name of spqr library (necessary due to error in debian package) +# SUITESPARSE_LIBRARY_DIR - Library main directory containing suitesparse libs +# SUITESPARSE_LIBRARY_DIRS - all Library directories containing suitesparse libs +# SUITESPARSE_SPQR_VALID - automatic identification whether or not spqr package is installed correctly + +IF (SUITESPARSE_INCLUDE_DIRS) + # Already in cache, be silent + SET(SUITESPARSE_FIND_QUIETLY TRUE) +ENDIF (SUITESPARSE_INCLUDE_DIRS) + +if( WIN32 ) + # Find cholmod part of the suitesparse library collection + + # 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( CHOLMOD_INCLUDE_DIR cholmod.h + PATHS "C:\\libs\\win32\\SuiteSparse\\Include" + "${VS_SEARCH_PATH}" + PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse + suitesparse-metis-for-windows-1.2.2-install/include/suitesparse + ) + + # Add cholmod include directory to collection include directories + IF ( CHOLMOD_INCLUDE_DIR ) + list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) + ENDIF( CHOLMOD_INCLUDE_DIR ) + + + # find path suitesparse library + FIND_PATH( SUITESPARSE_LIBRARY_DIRS + NAMES amd.lib libamd.lib + PATHS "C:\\libs\\win32\\SuiteSparse\\libs" + "${VS_SEARCH_PATH}" + PATH_SUFFIXES suitesparse-4.2.1/lib64 + suitesparse-metis-for-windows-1.2.2-install/lib64 ) + + # if we found the library, add it to the defined libraries + IF ( SUITESPARSE_LIBRARY_DIRS ) + if ( EXISTS "${SUITESPARSE_LIBRARY_DIRS}/libamd.lib" ) + list ( APPEND SUITESPARSE_LIBRARIES optimized;libamd;optimized;libcamd;optimized;libccolamd;optimized;libcholmod;optimized;libcolamd;optimized;metis;optimized;libspqr;optimized;libumfpack;debug;libamdd;debug;libcamdd;debug;libccolamdd;debug;libcholmodd;debug;libspqrd;debug;libumfpackd;debug;libcolamdd;debug;metisd;optimized;liblapack;debug;liblapackd;optimized;suitesparseconfig;debug;suitesparseconfigd ) + else() + list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;libf2c;optimized;lapack;debug;blasd;debug;libf2cd;debug;lapackd ) + endif() + + if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp") + SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid") + else() + SET(SUITESPARSE_SPQR_VALID FALSE CACHE BOOL "SuiteSparseSPQR valid") + endif() + + if(SUITESPARSE_SPQR_VALID) + FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY + NAMES libspqr + PATHS ${SUITESPARSE_LIBRARY_DIRS} ) + IF (SUITESPARSE_SPQR_LIBRARY) + list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd) + ENDIF (SUITESPARSE_SPQR_LIBRARY) + endif() + + + ENDIF( SUITESPARSE_LIBRARY_DIRS ) + +else( WIN32 ) + IF( APPLE) + FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h + PATHS /opt/local/include/ufsparse ) + + FIND_PATH( SUITESPARSE_LIBRARY_DIR + NAMES libSuiteSparse.dylib + PATHS /opt/local/lib ) + + list ( APPEND SUITESPARSE_LIBRARY_DIRS ${SUITESPARSE_LIBRARY_DIR} ) + + list ( APPEND SUITESPARSE_LIBRARIES SuiteSparse) + + ELSE(APPLE) + FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h + PATHS /usr/local/include + /usr/include + /usr/include/suitesparse/ + ${CMAKE_SOURCE_DIR}/MacOS/Libs/cholmod + PATH_SUFFIXES cholmod/ CHOLMOD/ ) + + + FIND_PATH( SUITESPARSE_LIBRARY_DIR + NAMES libcholmod.so + PATHS /usr/lib + /usr/lib64 + /usr/local/lib + /usr/lib/x86_64-linux-gnu ) + + + ENDIF(APPLE) + + # Add cholmod include directory to collection include directories + IF ( CHOLMOD_INCLUDE_DIR ) + list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) + ENDIF( CHOLMOD_INCLUDE_DIR ) + + + # if we found the library, add it to the defined libraries + IF ( SUITESPARSE_LIBRARY_DIR ) + + # Skipped, as this is set for apple in the block above +# if (NOT APPLE) + list ( APPEND SUITESPARSE_LIBRARIES amd) + list ( APPEND SUITESPARSE_LIBRARIES btf) + list ( APPEND SUITESPARSE_LIBRARIES camd) + list ( APPEND SUITESPARSE_LIBRARIES ccolamd) + list ( APPEND SUITESPARSE_LIBRARIES cholmod) + list ( APPEND SUITESPARSE_LIBRARIES colamd) + # list ( APPEND SUITESPARSE_LIBRARIES csparse) + list ( APPEND SUITESPARSE_LIBRARIES cxsparse) + list ( APPEND SUITESPARSE_LIBRARIES klu) + # list ( APPEND SUITESPARSE_LIBRARIES spqr) + list ( APPEND SUITESPARSE_LIBRARIES umfpack) + # endif() + + # Metis and spqr are optional + FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY + NAMES metis + PATHS ${SUITESPARSE_LIBRARY_DIR} ) + IF (SUITESPARSE_METIS_LIBRARY) + list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY}) + ENDIF(SUITESPARSE_METIS_LIBRARY) + + if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp") + SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid") + else() + SET(SUITESPARSE_SPQR_VALID false CACHE BOOL "SuiteSparseSPQR valid") + endif() + + if(SUITESPARSE_SPQR_VALID) + FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY + NAMES spqr + PATHS ${SUITESPARSE_LIBRARY_DIR} ) + IF (SUITESPARSE_SPQR_LIBRARY) + list ( APPEND SUITESPARSE_LIBRARIES spqr) + ENDIF (SUITESPARSE_SPQR_LIBRARY) + endif() + + ENDIF( SUITESPARSE_LIBRARY_DIR ) + +endif( WIN32 ) + +IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) + IF(WIN32) + list (APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR}/../../UFconfig ) + ENDIF(WIN32) + SET(SUITESPARSE_FOUND TRUE) +ELSE (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) + SET( SUITESPARSE_FOUND FALSE ) +ENDIF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES) + -- GitLab From 7fb2e2a7ae9375eb4dca476aa1bd6ab14a6074d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 26 Apr 2016 15:35:08 +0200 Subject: [PATCH 2/5] Fixed typo --- cmake/FindASSIMP.cmake | 2 +- cmake/FindBLAS.cmake | 2 +- cmake/FindCBC.cmake | 2 +- cmake/FindCGL.cmake | 2 +- cmake/FindCLP.cmake | 2 +- cmake/FindCOINUTILS.cmake | 2 +- cmake/FindFLANN.cmake | 2 +- cmake/FindGLEW.cmake | 2 +- cmake/FindGLUT.cmake | 2 +- cmake/FindIPOPT.cmake | 2 +- cmake/FindLAPACK.cmake | 2 +- cmake/FindMETIS.cmake | 2 +- cmake/FindMUMPS.cmake | 2 +- cmake/FindOSI.cmake | 2 +- cmake/FindQwt6.cmake | 2 +- cmake/FindSUITESPARSE.cmake | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cmake/FindASSIMP.cmake b/cmake/FindASSIMP.cmake index 227206d27..511dee313 100644 --- a/cmake/FindASSIMP.cmake +++ b/cmake/FindASSIMP.cmake @@ -29,7 +29,7 @@ if( WIN32 ) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindBLAS.cmake b/cmake/FindBLAS.cmake index 390a07aa7..70ab2ae1d 100755 --- a/cmake/FindBLAS.cmake +++ b/cmake/FindBLAS.cmake @@ -39,7 +39,7 @@ include(CGAL_GeneratorSpecificSettings) 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindCBC.cmake b/cmake/FindCBC.cmake index 8abe205c1..62944d5ec 100644 --- a/cmake/FindCBC.cmake +++ b/cmake/FindCBC.cmake @@ -9,7 +9,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindCGL.cmake b/cmake/FindCGL.cmake index e0f943473..69402c2c7 100644 --- a/cmake/FindCGL.cmake +++ b/cmake/FindCGL.cmake @@ -9,7 +9,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindCLP.cmake b/cmake/FindCLP.cmake index a52160577..a7055ab70 100644 --- a/cmake/FindCLP.cmake +++ b/cmake/FindCLP.cmake @@ -10,7 +10,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindCOINUTILS.cmake b/cmake/FindCOINUTILS.cmake index dfc0ff2bb..367b21cc6 100644 --- a/cmake/FindCOINUTILS.cmake +++ b/cmake/FindCOINUTILS.cmake @@ -9,7 +9,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindFLANN.cmake b/cmake/FindFLANN.cmake index 15dd730b4..f229af85e 100644 --- a/cmake/FindFLANN.cmake +++ b/cmake/FindFLANN.cmake @@ -31,7 +31,7 @@ if( FLANN_INCLUDE_DIR ) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index 2668776f3..ff2d6a23b 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -18,7 +18,7 @@ if( WIN32 ) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake index 6cbaec723..3d20c2536 100644 --- a/cmake/FindGLUT.cmake +++ b/cmake/FindGLUT.cmake @@ -26,7 +26,7 @@ IF (WIN32) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake index 2ca0652c1..1d11feee6 100644 --- a/cmake/FindIPOPT.cmake +++ b/cmake/FindIPOPT.cmake @@ -23,7 +23,7 @@ if (WIN32) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindLAPACK.cmake b/cmake/FindLAPACK.cmake index 181fbae1e..e470fccba 100755 --- a/cmake/FindLAPACK.cmake +++ b/cmake/FindLAPACK.cmake @@ -38,7 +38,7 @@ include(CGAL_GeneratorSpecificSettings) 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindMETIS.cmake b/cmake/FindMETIS.cmake index 961e1bf67..980fa97fb 100644 --- a/cmake/FindMETIS.cmake +++ b/cmake/FindMETIS.cmake @@ -14,7 +14,7 @@ endif (METIS_INCLUDE_DIR) 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake index d9d759e0b..4d146fffa 100644 --- a/cmake/FindMUMPS.cmake +++ b/cmake/FindMUMPS.cmake @@ -14,7 +14,7 @@ endif (MUMPS_INCLUDE_DIR) 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindOSI.cmake b/cmake/FindOSI.cmake index 7702cb04b..6c0eb9116 100644 --- a/cmake/FindOSI.cmake +++ b/cmake/FindOSI.cmake @@ -8,7 +8,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindQwt6.cmake b/cmake/FindQwt6.cmake index c557102f7..b0a6364b4 100644 --- a/cmake/FindQwt6.cmake +++ b/cmake/FindQwt6.cmake @@ -11,7 +11,7 @@ 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 +endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") diff --git a/cmake/FindSUITESPARSE.cmake b/cmake/FindSUITESPARSE.cmake index 3b99b9352..aeb60207b 100644 --- a/cmake/FindSUITESPARSE.cmake +++ b/cmake/FindSUITESPARSE.cmake @@ -22,7 +22,7 @@ if( WIN32 ) 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 + endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/") -- GitLab From 42e90040ccf22f5a2e10801a6f29def24e803e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 26 Apr 2016 15:35:32 +0200 Subject: [PATCH 3/5] Fixed typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7094c919..891923cea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.8.9) if ( WIN32 ) # 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 +endif() if (NOT CMAKE_BUILD_TYPE) message(STATUS "No build type selected, default to Release") -- GitLab From e24124b9fbba2bb864094b6bd6d7a2e15be601e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 26 Apr 2016 15:39:48 +0200 Subject: [PATCH 4/5] Updated Eigen3 finder --- cmake/FindEIGEN3.cmake | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/cmake/FindEIGEN3.cmake b/cmake/FindEIGEN3.cmake index 5a4b361f6..1d230e292 100644 --- a/cmake/FindEIGEN3.cmake +++ b/cmake/FindEIGEN3.cmake @@ -9,6 +9,27 @@ if (EIGEN3_INCLUDE_DIR) set(EIGEN3_INCLUDE_DIRS "${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 NAMES Eigen/Dense PATHS $ENV{EIGEN_DIR} @@ -16,13 +37,13 @@ find_path( EIGEN3_INCLUDE_DIR /usr/local/include /usr/local/include/eigen3/ /opt/local/include/eigen3/ - "c:\\libs\\Eigen-3.2.6" - "c:\\libs\\Eigen-3.2.6\\include" - "c:\\libs\\Eigen-3.2.1" - "c:\\libs\\Eigen-3.2.1\\include" - "c:\\libs\\Eigen-3.2\\include" - "c:\\libs\\eigen3\\include" - "c:\\libs\\eigen\\include" + "${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 ../../External/include ${module_file_path}/../../../External/include -- GitLab From 9865b409ce2162571a3d5c4a773dc30ff47694d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 26 Apr 2016 17:43:50 +0200 Subject: [PATCH 5/5] Bad escape for linux fixed --- cmake/FindASSIMP.cmake | 2 +- cmake/FindBLAS.cmake | 2 +- cmake/FindCBC.cmake | 2 +- cmake/FindCGL.cmake | 2 +- cmake/FindCLP.cmake | 2 +- cmake/FindCOINUTILS.cmake | 2 +- cmake/FindEIGEN3.cmake | 2 +- cmake/FindFLANN.cmake | 2 +- cmake/FindIPOPT.cmake | 2 +- cmake/FindLAPACK.cmake | 2 +- cmake/FindMETIS.cmake | 2 +- cmake/FindMUMPS.cmake | 2 +- cmake/FindOSI.cmake | 2 +- cmake/FindQwt6.cmake | 2 +- cmake/FindSUITESPARSE.cmake | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmake/FindASSIMP.cmake b/cmake/FindASSIMP.cmake index 511dee313..72e58972c 100644 --- a/cmake/FindASSIMP.cmake +++ b/cmake/FindASSIMP.cmake @@ -28,7 +28,7 @@ if( WIN32 ) # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindBLAS.cmake b/cmake/FindBLAS.cmake index 70ab2ae1d..707378efa 100755 --- a/cmake/FindBLAS.cmake +++ b/cmake/FindBLAS.cmake @@ -38,7 +38,7 @@ include(CGAL_GeneratorSpecificSettings) # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindCBC.cmake b/cmake/FindCBC.cmake index 62944d5ec..01382bbba 100644 --- a/cmake/FindCBC.cmake +++ b/cmake/FindCBC.cmake @@ -8,7 +8,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindCGL.cmake b/cmake/FindCGL.cmake index 69402c2c7..da22b051c 100644 --- a/cmake/FindCGL.cmake +++ b/cmake/FindCGL.cmake @@ -8,7 +8,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindCLP.cmake b/cmake/FindCLP.cmake index a7055ab70..b31a3474b 100644 --- a/cmake/FindCLP.cmake +++ b/cmake/FindCLP.cmake @@ -9,7 +9,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindCOINUTILS.cmake b/cmake/FindCOINUTILS.cmake index 367b21cc6..94cc7135b 100644 --- a/cmake/FindCOINUTILS.cmake +++ b/cmake/FindCOINUTILS.cmake @@ -8,7 +8,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindEIGEN3.cmake b/cmake/FindEIGEN3.cmake index 1d230e292..303066f95 100644 --- a/cmake/FindEIGEN3.cmake +++ b/cmake/FindEIGEN3.cmake @@ -12,7 +12,7 @@ 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindFLANN.cmake b/cmake/FindFLANN.cmake index f229af85e..f40d8bc7c 100644 --- a/cmake/FindFLANN.cmake +++ b/cmake/FindFLANN.cmake @@ -30,7 +30,7 @@ if( FLANN_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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake index 1d11feee6..141982ccd 100644 --- a/cmake/FindIPOPT.cmake +++ b/cmake/FindIPOPT.cmake @@ -22,7 +22,7 @@ if (WIN32) # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindLAPACK.cmake b/cmake/FindLAPACK.cmake index e470fccba..1353294ab 100755 --- a/cmake/FindLAPACK.cmake +++ b/cmake/FindLAPACK.cmake @@ -37,7 +37,7 @@ include(CGAL_GeneratorSpecificSettings) # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindMETIS.cmake b/cmake/FindMETIS.cmake index 980fa97fb..a7d06e034 100644 --- a/cmake/FindMETIS.cmake +++ b/cmake/FindMETIS.cmake @@ -13,7 +13,7 @@ endif (METIS_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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake index 4d146fffa..62ab4e286 100644 --- a/cmake/FindMUMPS.cmake +++ b/cmake/FindMUMPS.cmake @@ -13,7 +13,7 @@ endif (MUMPS_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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindOSI.cmake b/cmake/FindOSI.cmake index 6c0eb9116..7a06cdc27 100644 --- a/cmake/FindOSI.cmake +++ b/cmake/FindOSI.cmake @@ -7,7 +7,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindQwt6.cmake b/cmake/FindQwt6.cmake index b0a6364b4..b886b069a 100644 --- a/cmake/FindQwt6.cmake +++ b/cmake/FindQwt6.cmake @@ -10,7 +10,7 @@ # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) diff --git a/cmake/FindSUITESPARSE.cmake b/cmake/FindSUITESPARSE.cmake index aeb60207b..921ac21a7 100644 --- a/cmake/FindSUITESPARSE.cmake +++ b/cmake/FindSUITESPARSE.cmake @@ -21,7 +21,7 @@ if( WIN32 ) # 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." ) + set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." ) endif() if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" ) -- GitLab