Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CoMISo
CoMISo
Commits
4df5005d
Commit
4df5005d
authored
May 24, 2018
by
Jan Möbius
Browse files
Merge branch 'featureCILessHardCodedPaths' into 'master'
Feature ci less hard coded paths See merge request
!31
parents
6480c157
162c70a4
Pipeline
#7073
failed with stages
in 6 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CI/Windows.bat
View file @
4df5005d
...
...
@@ -49,7 +49,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
)
SET
BOOST_ROOT
=
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-D
GLUT
_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%
-D
BOOST
_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
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\Qt
%QT_REV%
\
%QT_REV%
\msvc2017_64
%QT_SUFFIX%
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-D
GLUT
_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%
-D
BOOST
_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
View file @
4df5005d
...
...
@@ -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"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment