Skip to content

CoMISo
CoMISo
Commit 4fb5a6b6 authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Merge branch 'VS2017CI' into 'master' 

Vs2017 ci

See merge request CoMISo/CoMISo!30
parents 497ba860 af16c502
Pipeline #7061 canceled with stages
      in 6 minutes and 29 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 107 additions and 19 deletions
      .gitlab-ci.yml
      View file @ 4fb5a6b6
      ......@@ -26,6 +26,19 @@ CoMISo-VS2013-Qt-5.5.1-x64:
      - VS2013
      - Qt551
      CoMISo-VS2017-Qt-5.10.1-x64:
      variables:
      BUILD_PLATFORM: "VS2017"
      ARCHITECTURE: "x64"
      QT_VERSION: "Qt5.10.1"
      GIT_SUBMODULE_STRATEGY: recursive
      COMPILER: "VS2017"
      script: "CI\\Windows.bat"
      tags:
      - VS2017
      - IPOPT3129
      trigger_build:
      stage: deploy
      script:
      ......
      CI/Windows.bat
      View file @ 4fb5a6b6
      ......@@ -29,6 +29,11 @@ IF "%QT_VERSION%" == "Qt5.5.1" (
      set QT_SUFFIX=
      )
      IF "%QT_VERSION%" == "Qt5.10.1" (
      set QT_REV=5.10.1
      set QT_SUFFIX=
      )
      IF "%BUILD_PLATFORM%" == "VS2013" (
      set LIBPATH=E:/libs/VS2013
      ......@@ -44,6 +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"
      )
      IF "%BUILD_PLATFORM%" == "VS2015" (
      ......@@ -54,7 +60,15 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
      set QT_BASE_CONFIG=TODO
      )
      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"
      IF "%BUILD_PLATFORM%" == "VS2017" (
      set LIBPATH=E:/libs/VS2017
      set GTESTVERSION=gtest-1.7.0
      set GENERATOR=Visual Studio 15%ARCH_VS%
      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"
      )
      "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/CGAL_GeneratorSpecificSettings.cmake
      View file @ 4fb5a6b6
      ......@@ -8,7 +8,13 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
      set(CGAL_AUTO_LINK_ENABLED TRUE)
      endif()
      if ( MSVC90 )
      if (MSVC12)
      set(CGAL_TOOLSET "vc120")
      elseif ( MSVC11 )
      set(CGAL_TOOLSET "vc110")
      elseif ( MSVC10 )
      set(CGAL_TOOLSET "vc100")
      elseif ( MSVC90 )
      set(CGAL_TOOLSET "vc90")
      message( STATUS "Using VC90 compiler." )
      elseif ( MSVC80 )
      ......
      cmake/FindBLAS.cmake
      View file @ 4fb5a6b6
      ......@@ -53,6 +53,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()
      ......
      cmake/FindCBC.cmake
      View file @ 4fb5a6b6
      ......@@ -23,6 +23,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()
      ......
      cmake/FindCGL.cmake
      View file @ 4fb5a6b6
      ......@@ -23,6 +23,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 ( NOT CGL_FOUND)
      ......
      cmake/FindCLP.cmake
      View file @ 4fb5a6b6
      ......@@ -24,6 +24,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 (NOT CLP_FOUND)
      ......
      cmake/FindCOINUTILS.cmake
      View file @ 4fb5a6b6
      ......@@ -23,6 +23,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 ( NOT COINUTILS_FOUND )
      ......
      cmake/FindEIGEN3.cmake
      View file @ 4fb5a6b6
      ......@@ -27,6 +27,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()
      ......@@ -37,18 +41,19 @@ find_path( EIGEN3_INCLUDE_DIR
      /usr/local/include
      /usr/local/include/eigen3/
      /opt/local/include/eigen3/
      "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.3.4"
      "${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.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}/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_WINDOWS_LIBS_DIR}/eigen/include"
      ${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include
      ../../External/include
      ${module_file_path}/../../../External/include
      )
      set(EIGEN3_INCLUDE_DIRS "${EIGEN3_INCLUDE_DIR}" )
      ......
      cmake/FindLAPACK.cmake
      View file @ 4fb5a6b6
      ......@@ -52,6 +52,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()
      ......
      cmake/FindMETIS.cmake
      View file @ 4fb5a6b6
      ......@@ -28,6 +28,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()
      ......
      cmake/FindMUMPS.cmake
      View file @ 4fb5a6b6
      ......@@ -28,6 +28,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()
      find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
      ......@@ -62,4 +66,4 @@ include(FindPackageHandleStandardArgs)
      find_package_handle_standard_args(MUMPS DEFAULT_MSG
      MUMPS_LIBRARY MUMPS_INCLUDE_DIR)
      mark_as_advanced(MUMPS_INCLUDE_DIR MUMPS_LIBRARY )
      \ No newline at end of file
      mark_as_advanced(MUMPS_INCLUDE_DIR MUMPS_LIBRARY )
      cmake/FindOSI.cmake
      View file @ 4fb5a6b6
      ......@@ -22,6 +22,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()
      ......
      cmake/FindSPECTRA.cmake
      View file @ 4fb5a6b6
      ......@@ -27,6 +27,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()
      ......
      cmake/FindSUITESPARSE.cmake
      View file @ 4fb5a6b6
      ......@@ -18,15 +18,25 @@ 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()
      # 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
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment