Merge branch 'fixCMakeFinders' into 'master'

Fix c make finders

See merge request !99

cmake/FindASSIMP.cmake

@@ -43,12 +43,17 @@ if( WIN32 )
    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/")
+ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" )
+   SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/")
+ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
+   SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
  endif()
 
  # Find the headers
  FIND_PATH( ASSIMP_INCLUDE_DIR assimp/scene.h
             PATHS /usr/include 
-                  "${VS_SEARCH_PATH}assimp/include"
+                  "${VS_SEARCH_PATH}assimp-4.1.0/include"
+				  "${VS_SEARCH_PATH}assimp/include"
                   "C:/Program Files/Assimp/include" )
 
 
@@ -56,9 +61,11 @@ if( WIN32 )
  FIND_LIBRARY( ASSIMP_LIBRARY
                NAMES assimp
 	       PATH_SUFFIXES ${DIRSUFFIX}
-               PATHS "${CMAKE_WINDOWS_LIBS_DIR}/assimp/lib"
-                     "${VS_SEARCH_PATH}assimp/lib" 
-	             "C:/Program Files/Assimp/lib"
+               PATHS "${CMAKE_WINDOWS_LIBS_DIR}/assimp-4.1.0/lib"
+                     "${VS_SEARCH_PATH}assimp-4.1.0/lib"
+                     "${CMAKE_WINDOWS_LIBS_DIR}/assimp/lib"
+                     "${VS_SEARCH_PATH}assimp/lib"
+                     "C:/Program Files/Assimp/lib"
                )  
 
 

cmake/FindGLUT.cmake

@@ -40,6 +40,10 @@ IF (WIN32)
     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/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
   endif()
 
 
@@ -49,7 +53,17 @@ IF (WIN32)
            "${VS_SEARCH_PATH}/freeglut-3.0.0/include" 
            "${VS_SEARCH_PATH}/freeglut-2.8.1/include" )
 
-  FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut32 glut freeglut
+  FIND_LIBRARY( GLUT_release_LIBRARY NAMES glut32 glut freeglut
+    PATHS
+    ${OPENGL_LIBRARY_DIR}
+    ${GLUT_ROOT_PATH}/Release
+    "${CMAKE_WINDOWS_LIBS_DIR}/glut-3.7/lib"
+    "${VS_SEARCH_PATH}/freeglut-3.0.0/lib"
+    "${VS_SEARCH_PATH}/freeglut-2.8.1/lib"
+    )
+  GET_FILENAME_COMPONENT( GLUT_LIBRARY_DIR ${GLUT_release_LIBRARY} PATH )
+	
+  FIND_LIBRARY( GLUT_debug_LIBRARY NAMES glut32d glutd freeglutd
     PATHS
     ${OPENGL_LIBRARY_DIR}
     ${GLUT_ROOT_PATH}/Release
@@ -58,7 +72,7 @@ IF (WIN32)
     "${VS_SEARCH_PATH}/freeglut-2.8.1/lib"
     )
 
-  GET_FILENAME_COMPONENT( GLUT_LIBRARY_DIR ${GLUT_glut_LIBRARY} PATH ) 
+  set(GLUT_glut_LIBRARY optimized ${GLUT_release_LIBRARY} debug ${GLUT_debug_LIBRARY})  
  
 ELSE (WIN32)
   

cmake/FindQwt6.cmake

@@ -25,6 +25,10 @@ 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/")
+elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" )
+  SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/")
+elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
+  SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
 endif()
 
 if (QT5_FOUND)
@@ -56,6 +60,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h
                /usr/include
                /usr/include/qwt
                "${VS_SEARCH_PATH}/qwt-6.1.0/include"
+			   "${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/include"
                c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0
                c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2
                c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.1
@@ -83,6 +88,7 @@ if (QWT6_VERSION_FOUND)
     find_library(QWT6_LIBRARY_RELEASE NAMES qwt
       PATHS
       "${VS_SEARCH_PATH}/qwt-6.1.0/lib"
+	  "${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/lib"
       "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib"
       "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib"
       "c:\\libs\\Qwt-6.1.0\\lib"
@@ -92,6 +98,7 @@ if (QWT6_VERSION_FOUND)
     find_library(QWT6_LIBRARY_DEBUG NAMES qwtd
       PATHS
       "${VS_SEARCH_PATH}/qwt-6.1.0/lib"
+	  "${VS_SEARCH_PATH}/qwt-6.1.3-qt${Qt5Core_VERSION_STRING}/lib"
       "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2\\lib"
       "c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.1.0\\lib"
       "c:\\libs\\Qwt-6.1.0\\lib"