Merge branch 'featureCILessHardCodedPaths' into 'master'

Feature ci less hard coded paths

See merge request CoMISo/CoMISo!31

CI/Windows.bat

@@ -49,7 +49,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
     )
 
     SET BOOST_ROOT=
-    set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\freeglut-2.8.1\include" -DGLUT_glut_LIBRARY="%LIBPATH%\%ARCHITECTURE%\freeglut-2.8.1\lib\freeglut.lib" -DGLEW_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\glew-1.10.0\include" -DGLEW_LIBRARY="%LIBPATH%\%ARCHITECTURE%\glew-1.10.0\lib\glew32.lib" -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0/lib64-msvc-12.0" -DCGAL_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/include" -DCGAL_LIBRARY_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/lib" -DCGAL_BIN_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.7/bin" -DMUMPS_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/include" -DMUMPS_LIBRARY="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.11.9/Ipopt/MSVisualStudio/v8-ifort/installed/lib/CoinMumpsC.lib"
+    set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0/lib64-msvc-12.0"
 ) 
 
 IF "%BUILD_PLATFORM%" == "VS2015" (
@@ -67,7 +67,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
     set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
     set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\Qt%QT_REV%\%QT_REV%\msvc2017_64%QT_SUFFIX% 
     
-    set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\freeglut-3.0.0\include" -DGLUT_glut_LIBRARY="%LIBPATH%\%ARCHITECTURE%\freeglut-3.0.0\lib\freeglut.lib" -DGLEW_INCLUDE_DIR="%LIBPATH%\%ARCHITECTURE%\glew-2.0.0\include" -DGLEW_LIBRARY="%LIBPATH%\%ARCHITECTURE%\glew-2.0.0\lib\glew32.lib" -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0/lib64-msvc-14.1" -DCGAL_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.12/include" -DCGAL_LIBRARY_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.12/lib" -DCGAL_BIN_DIR="%LIBPATH%/%ARCHITECTURE%/CGAL-4.12/bin" -DMUMPS_INCLUDE_DIR="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.12.9/include" -DMUMPS_LIBRARY="%LIBPATH%/%ARCHITECTURE%/Ipopt-3.12.9/lib/CoinMumpsC.lib"
+    set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0/lib64-msvc-14.1"
 )
 
 "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR% %CMAKE_CONFIGURATION% ..

cmake/FindCGAL.cmake

@@ -84,14 +84,21 @@ IF(CGAL_INCLUDE_DIR )
   IF(WIN32)
     include(CGAL_GeneratorSpecificSettings)
     find_path(CGAL_LIBRARY_DIR 
-                NAMES "CGAL-${CGAL_TOOLSET}-mt.lib" "CGAL-${CGAL_TOOLSET}-mt-gd.lib" "CGAL-${CGAL_TOOLSET}-mt-4.5.lib"
+                NAMES "CGAL-${CGAL_TOOLSET}-mt.lib" 
+				      "CGAL-${CGAL_TOOLSET}-mt-gd.lib" 
+					  "CGAL-${CGAL_TOOLSET}-mt-4.12.lib" 
+					  "CGAL-${CGAL_TOOLSET}-mt-4.7.lib" 
+					  "CGAL-${CGAL_TOOLSET}-mt-4.5.lib"
                 PATHS "${CGAL_INCLUDE_DIR}/../lib"
                 DOC "Directory containing the CGAL library"
                ) 
 			
     # Binary dir for DLLs			
 	find_path(CGAL_BIN_DIR 
-                NAMES "CGAL-${CGAL_TOOLSET}-mt-4.5.dll" "CGAL-${CGAL_TOOLSET}-mt-gd.dll"
+                NAMES "CGAL-${CGAL_TOOLSET}-mt-4.12.dll" 
+				      "CGAL-${CGAL_TOOLSET}-mt-4.7.dll" 
+				      "CGAL-${CGAL_TOOLSET}-mt-4.5.dll" 
+					  "CGAL-${CGAL_TOOLSET}-mt-gd.dll"
                 PATHS "${CGAL_INCLUDE_DIR}/../bin"
                 DOC "Directory containing the CGAL DLLs"
                )