Updated finders

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

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()
 
 

cmake/FindCGL.cmake

-# - Try to find CGL
-# Once done this will define
-#  CGL_FOUND - System has CGL
-#  CGL_INCLUDE_DIRS - The CGL include directories
-#  CGL_LIBRARIES - The libraries needed to use CGL
-
-# 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 ( NOT CGL_FOUND)
-
-find_path(CGL_INCLUDE_DIR 
-          NAMES CglConfig.h
-          PATHS "$ENV{CGL_DIR}/include/coin"
-                "$ENV{CBC_DIR}/include/coin"
-                 "/usr/include/coin"
-                 "C:\\libs\\cgl\\include"
-                 "C:\\libs\\cbc\\include"
-                 "${VS_SEARCH_PATH}CBC-2.9.7/Cgl/include"
-                 "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
-              )
-
-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.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}" )
-
-
-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 CGL
+# Once done this will define
+#  CGL_FOUND - System has CGL
+#  CGL_INCLUDE_DIRS - The CGL include directories
+#  CGL_LIBRARIES - The libraries needed to use CGL
+
+
+# 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 ( NOT CGL_FOUND)
+
+find_path(CGL_INCLUDE_DIR 
+          NAMES CglConfig.h
+          PATHS "$ENV{CGL_DIR}/include/coin"
+                "$ENV{CBC_DIR}/include/coin"
+                 "/usr/include/coin"
+                 "C:\\libs\\cgl\\include"
+                 "C:\\libs\\cbc\\include"
+                 "${VS_SEARCH_PATH}CBC-2.9.7/Cgl/include"
+                 "${VS_SEARCH_PATH}CBC-2.9.4/Cgl/include"
+              )
+
+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.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}" )
+
+
+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)

cmake/FindCLP.cmake

-# - Try to find CLP
-# Once done this will define
-#  CLP_FOUND - System has CLP
-#  CLP_INCLUDE_DIRS - The CLP include directories
-#  CLP_LIBRARIES - The libraries needed to use CLP
-
-
-# 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 (NOT CLP_FOUND)
-
-find_path(CLP_INCLUDE_DIR 
-          NAMES ClpConfig.h
-          PATHS "$ENV{CLP_DIR}/include/coin"
-                "$ENV{CBC_DIR}/include/coin"
-                 "/usr/include/coin"
-                 "C:\\libs\\clp\\include"
-                 "C:\\libs\\cbc\\include"
-                 "${VS_SEARCH_PATH}CBC-2.9.7/Clp/include"
-                 "${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
-              )
-
-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.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}" )
-
-
-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)
+# - Try to find CLP
+# Once done this will define
+#  CLP_FOUND - System has CLP
+#  CLP_INCLUDE_DIRS - The CLP include directories
+#  CLP_LIBRARIES - The libraries needed to use CLP
+
+
+
+# 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 (NOT CLP_FOUND)
+
+find_path(CLP_INCLUDE_DIR 
+          NAMES ClpConfig.h
+          PATHS "$ENV{CLP_DIR}/include/coin"
+                "$ENV{CBC_DIR}/include/coin"
+                 "/usr/include/coin"
+                 "C:\\libs\\clp\\include"
+                 "C:\\libs\\cbc\\include"
+                 "${VS_SEARCH_PATH}CBC-2.9.7/Clp/include"
+                 "${VS_SEARCH_PATH}CBC-2.9.4/Clp/include"
+              )
+
+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.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}" )
+
+
+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)

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 )

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,8 +37,15 @@ find_path( EIGEN3_INCLUDE_DIR
                  /usr/local/include
                  /usr/local/include/eigen3/
                  /opt/local/include/eigen3/
-                 "c:\\libs\\eigen3\\include"
-		 "c:\\libs\\eigen\\include"
+                 "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.8"
+                 "${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
                   ../../External/include
                   ${module_file_path}/../../../External/include

cmake/FindGMM.cmake

@@ -10,23 +10,30 @@ if (GMM_INCLUDE_DIR)
   set(GMM_INCLUDE_DIRS "${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 
            NAMES gmm/gmm.h 
            PATHS $ENV{GMM_DIR}
                  /usr/include
                  /usr/include
                  /usr/local/include
-                 ~/sw/gmm-4.3/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-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
                  ../../External/include
                  /ACG/acgdev/gcc-4.3-i686/gmm-4.1/include/
                  /ACG/acgdev/gcc-4.3-i686/gmm-3/include/
                  ${module_file_path}/../../../External/include
-                 $ENV{HOME}/opt/gmm/gmm-4.2/include
           )
 
 set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" )
@@ -34,10 +41,10 @@ set(GMM_INCLUDE_DIRS "${GMM_INCLUDE_DIR}" )
 
 # use c++ headers as default
 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)
 ELSE(WIN32)
-  set(GMM_COMPILER_FLAGS "" CACHE STRING "GMM Compiler Flags")
+  set(GMM_COMPILE_DEFINITIONS "" CACHE STRING "GMM Compiler Definitions")
 ENDIF(WIN32)
 
 include(FindPackageHandleStandardArgs)
@@ -46,7 +53,7 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GMM  DEFAULT_MSG
                                   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)
 

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

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
@@ -234,7 +245,6 @@ else()
       cheev
       ""
       "liblapack"
-      "${BLAS_LIBRARIES}"
       "${VS_SEARCH_PATH}OpenBLAS-v0.2.9.rc2/lib"
       )
     endif()

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()
 
 

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.*" )