Add cmake flag to set library dir for search path base, added vs2015 search paths

4bcf2050 · Jan Möbius · 22938119 · 4bcf2050 · 4bcf2050 · 4bcf2050
Commit 4bcf2050 authored Apr 26, 2016 by Jan Möbius
17 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 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)

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

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

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



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

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

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

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



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


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


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

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

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



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

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



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

--- a/cmake/FindSUITESPARSE.cmake
+++ b/cmake/FindSUITESPARSE.cmake
-# - 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()
-	 
-