Skip to content

Commit 55d7326

Browse files
committed
Fix VC12 platforms
1 parent 253c17e commit 55d7326

File tree

5 files changed

+105
-204
lines changed

5 files changed

+105
-204
lines changed

Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_VC12-64

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ declare -x FrameworkVersion64="v4.0.30319"
99
declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\INCLUDE;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt;"
1010
declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\lib\\winv6.3\\um\\x64;"
1111
declare -x LIBPATH="C:\\WINDOWS\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\References\\CommonConfiguration\\Neutral;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs\\Microsoft.VCLibs\\12.0\\References\\CommonConfiguration\\neutral;"
12+
declare -x PATH="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/CommonExtensions/Microsoft/TestWindow:/cygdrive/c/Program Files (x86)/MSBuild/12.0/bin/amd64:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN/amd64:/cygdrive/c/WINDOWS/Microsoft.NET/Framework64/v4.0.30319:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/VCPackages:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/Tools:/cygdrive/c/Program Files (x86)/HTML Help Workshop:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Team Tools/Performance Tools/x64:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Team Tools/Performance Tools:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/bin/x64:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/bin/x86:/cygdrive/c/Program Files (x86)/Microsoft SDKs/Windows/v8.1A/bin/NETFX 4.5.1 Tools/x64:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/cygdrive/c/WINDOWS/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files (x86)/Windows Kits/8.0/Windows Performance Toolkit:/cygdrive/c/Program Files/Microsoft SQL Server/110/Tools/Binn:/cygdrive/c/Program Files (x86)/CMake 2.8/bin:/cygdrive/c/Program Files (x86)/Git/cmd:/cygdrive/c/Program Files/TortoiseGit/bin:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/Windows Performance Toolkit:/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin:/cygdrive/c/Program Files (x86)/CMake 2.8/bin:/usr/bin:/cygdrive/c/Program Files/CGAL-4.3-beta1/auxiliary/gmp/lib:/cygdrive/c/strawberry/perl/bin"
1213
declare -x Platform="X64"
1314
declare -x VCINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\"
1415
declare -x VSINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\"

Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/CMakeCache.txt

Lines changed: 23 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,15 @@ CGAL_Qt4_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0
108108
//Value Computed by CMake
109109
CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-I-REF
110110

111-
//No help, variable specified on the command line.
112-
CMAKE_BUILD_TYPE:UNINITIALIZED=Debug
111+
//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
112+
// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
113+
CMAKE_BUILD_TYPE:STRING=Debug
113114

114-
//Semicolon separated list of supported configuration types, only
115-
// supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything
116-
// else will be ignored.
117-
CMAKE_CONFIGURATION_TYPES:STRING=Debug;Release;MinSizeRel;RelWithDebInfo
115+
//Enable/Disable color output during build.
116+
CMAKE_COLOR_MAKEFILE:BOOL=ON
117+
118+
//CXX compiler.
119+
CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/cl.exe
118120

119121
//User-defined flags
120122
CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except-
@@ -123,7 +125,7 @@ CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /GR /EHsc -D_CRT_SECURE_NO_DEPREC
123125
CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1
124126

125127
//Flags used by the compiler during release minsize builds.
126-
CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1
128+
CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1
127129

128130
//Flags used by the compiler during release builds (/MD /Ob1 /Oi
129131
// /Ot /Oy /Gs will produce slightly less optimized but smaller
@@ -136,6 +138,9 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1
136138
//Libraries linked by defalut with all C++ applications.
137139
CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
138140

141+
//C compiler.
142+
CMAKE_C_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/cl.exe
143+
139144
//Flags used by the compiler during all build types.
140145
CMAKE_C_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3
141146

@@ -177,8 +182,8 @@ CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/CGAL
177182
//Path to a program.
178183
CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/link.exe
179184

180-
//make program
181-
CMAKE_MAKE_PROGRAM:FILEPATH=C:/PROGRA~2/MSBuild/12.0/Bin/MSBuild.exe
185+
//Program used to build from makefiles.
186+
CMAKE_MAKE_PROGRAM:STRING=nmake
182187

183188
//Flags used by the linker during the creation of modules.
184189
CMAKE_MODULE_LINKER_FLAGS:STRING=' /machine:X86 '
@@ -198,7 +203,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
198203
//Value Computed by CMake
199204
CMAKE_PROJECT_NAME:STATIC=CGAL
200205

201-
//RC compiler
206+
//RC compiler.
202207
CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.1/bin/x86/rc.exe
203208

204209
//Flags for Fortran compiler.
@@ -965,8 +970,6 @@ ZLIB_LIBRARY:FILEPATH=C:/3rdPartyLibs/VC-32/zlib/zdll.lib
965970
# INTERNAL cache entries
966971
########################
967972

968-
//Stored GUID
969-
ALL_BUILD_GUID_CMAKE:INTERNAL=75F747FA-4C88-49AE-9464-0BE77FACCA48
970973
//ADVANCED property for variable: Boost_DIR
971974
Boost_DIR-ADVANCED:INTERNAL=1
972975
//ADVANCED property for variable: Boost_INCLUDE_DIR
@@ -1041,8 +1044,6 @@ CGAL_Core_3RD_PARTY_DEFINITIONS:INTERNAL=
10411044
CGAL_Core_3RD_PARTY_INCLUDE_DIRS:INTERNAL=
10421045
CGAL_Core_3RD_PARTY_LIBRARIES:INTERNAL=
10431046
CGAL_Core_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
1044-
//Stored GUID
1045-
CGAL_Core_GUID_CMAKE:INTERNAL=5AE9CE5B-D4F3-4DB4-9CDD-1AA259FEA0FC
10461047
CGAL_Core_LIBRARY:INTERNAL=
10471048
//Variable hidden from user
10481049
CGAL_Core_LIBRARY_INSTALLED:INTERNAL=
@@ -1085,14 +1086,10 @@ CGAL_EXT_LIB_RS_PREFIX:INTERNAL=RS
10851086
CGAL_EXT_LIB_TAUCS_PREFIX:INTERNAL=TAUCS
10861087
//Variable hidden from user
10871088
CGAL_EXT_LIB_ZLIB_PREFIX:INTERNAL=ZLIB
1088-
//Stored GUID
1089-
CGAL_GUID_CMAKE:INTERNAL=381ADEC3-B219-4FD3-8817-38B3935563F6
10901089
CGAL_ImageIO_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_USE_ZLIB
10911090
CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/3rdPartyLibs/VC-32/zlib
10921091
CGAL_ImageIO_3RD_PARTY_LIBRARIES:INTERNAL=glu32;opengl32;C:/3rdPartyLibs/VC-32/zlib/zdll.lib
10931092
CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
1094-
//Stored GUID
1095-
CGAL_ImageIO_GUID_CMAKE:INTERNAL=8D8BD0B9-21FE-4F8A-A499-78C9A51D4E98
10961093
CGAL_ImageIO_LIBRARY:INTERNAL=
10971094
//Variable hidden from user
10981095
CGAL_ImageIO_LIBRARY_INSTALLED:INTERNAL=
@@ -1110,8 +1107,6 @@ CGAL_Qt4_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_DLL
11101107
CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include
11111108
CGAL_Qt4_3RD_PARTY_LIBRARIES:INTERNAL=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmaind.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGL4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGLd4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGui4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGuid4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCore4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCored4.lib;glu32;opengl32
11121109
CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
1113-
//Stored GUID
1114-
CGAL_Qt4_GUID_CMAKE:INTERNAL=412D9B2D-13ED-4B1F-A0B4-54CD39753D38
11151110
CGAL_Qt4_LIBRARY:INTERNAL=
11161111
//Variable hidden from user
11171112
CGAL_Qt4_LIBRARY_INSTALLED:INTERNAL=
@@ -1122,7 +1117,7 @@ CGAL_WIN32_CMAKE_ON_CYGWIN:INTERNAL=TRUE
11221117
//ADVANCED property for variable: CMAKE_BUILD_TOOL
11231118
CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
11241119
//What is the target build tool cmake is generating for.
1125-
CMAKE_BUILD_TOOL:INTERNAL=C:/PROGRA~2/MSBuild/12.0/Bin/MSBuild.exe
1120+
CMAKE_BUILD_TOOL:INTERNAL=nmake
11261121
//This is the directory where this CMakeCache.txt was created
11271122
CMAKE_CACHEFILE_DIR:INTERNAL=c:/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits
11281123
//Major version of cmake used to create the current loaded cache
@@ -1131,14 +1126,16 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
11311126
CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
11321127
//Patch version of cmake used to create the current loaded cache
11331128
CMAKE_CACHE_PATCH_VERSION:INTERNAL=11
1129+
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
1130+
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
11341131
//Path to CMake executable.
11351132
CMAKE_COMMAND:INTERNAL=C:/Program Files (x86)/CMake 2.8/bin/cmake.exe
1136-
//ADVANCED property for variable: CMAKE_CONFIGURATION_TYPES
1137-
CMAKE_CONFIGURATION_TYPES-ADVANCED:INTERNAL=1
11381133
//Path to cpack program executable.
11391134
CMAKE_CPACK_COMMAND:INTERNAL=C:/Program Files (x86)/CMake 2.8/bin/cpack.exe
11401135
//Path to ctest program executable.
11411136
CMAKE_CTEST_COMMAND:INTERNAL=C:/Program Files (x86)/CMake 2.8/bin/ctest.exe
1137+
//ADVANCED property for variable: CMAKE_CXX_COMPILER
1138+
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
11421139
//ADVANCED property for variable: CMAKE_CXX_FLAGS
11431140
CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
11441141
//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
@@ -1151,6 +1148,8 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
11511148
CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
11521149
//ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES
11531150
CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1
1151+
//ADVANCED property for variable: CMAKE_C_COMPILER
1152+
CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
11541153
//ADVANCED property for variable: CMAKE_C_FLAGS
11551154
CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
11561155
//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
@@ -1178,7 +1177,7 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
11781177
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
11791178
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
11801179
//Name of generator.
1181-
CMAKE_GENERATOR:INTERNAL=Visual Studio 12
1180+
CMAKE_GENERATOR:INTERNAL=NMake Makefiles
11821181
//Name of generator toolset.
11831182
CMAKE_GENERATOR_TOOLSET:INTERNAL=
11841183
//Start directory with the top level CMakeLists.txt file for this
@@ -1242,10 +1241,6 @@ FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[C:/3rdPartyLibs/VC-32/zlib/zdll.lib]
12421241
GMP_COMPILE_RES:INTERNAL=TRUE
12431242
//Result of TRY_RUN
12441243
GMP_RUN_RES:INTERNAL=0
1245-
//Generator uses intermediate configuration directory
1246-
HAS_CFG_INTDIR:INTERNAL=TRUE
1247-
//Stored GUID
1248-
INSTALL_GUID_CMAKE:INTERNAL=488F8717-7480-420F-96E7-E09B6844E4CC
12491244
//Variable hidden from user
12501245
LIBRARY_OUTPUT_PATH:INTERNAL=
12511246
//Result of TRY_COMPILE
@@ -1690,18 +1685,6 @@ Q_WS_QWS:INTERNAL=
16901685
Q_WS_WIN:INTERNAL=1
16911686
//Have symbol Q_WS_X11
16921687
Q_WS_X11:INTERNAL=
1693-
//Stored GUID
1694-
SG_Filter_CMake Rules_GUID_CMAKE:INTERNAL=374D9F17-617F-447C-9673-27B4C3A63AA6
1695-
//Stored GUID
1696-
SG_Filter_Header Files_GUID_CMAKE:INTERNAL=B13D3813-42B1-4E0E-8BFC-8CD0F7D70C48
1697-
//Stored GUID
1698-
SG_Filter_Object Files_GUID_CMAKE:INTERNAL=18761F21-106C-4535-9C61-1589139ABD08
1699-
//Stored GUID
1700-
SG_Filter_Resources_GUID_CMAKE:INTERNAL=E4857457-BA31-45C6-A4D1-E427BDD7DCA3
1701-
//Stored GUID
1702-
SG_Filter_Source Files_GUID_CMAKE:INTERNAL=86E5AE5A-61C0-4202-BD03-B750420E978A
1703-
//Stored GUID
1704-
ZERO_CHECK_GUID_CMAKE:INTERNAL=4D43C007-C51C-430D-894C-A5F2CA45EBA0
17051688
//Result of TRY_COMPILE
17061689
ZLIB_COMPILE_RES:INTERNAL=TRUE
17071690
//ADVANCED property for variable: ZLIB_INCLUDE_DIR
@@ -1722,12 +1705,4 @@ _Boost_LIBRARY_DIR_LAST:INTERNAL=C:/3rdPartyLibs/boost_1_55_0/lib32
17221705
_Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE
17231706
//Last used Boost_USE_STATIC_LIBS value.
17241707
_Boost_USE_STATIC_LIBS_LAST:INTERNAL=OFF
1725-
//Stored GUID
1726-
demos_GUID_CMAKE:INTERNAL=5BC64474-51CC-47E9-B75B-4B650CDD066A
1727-
//Stored GUID
1728-
examples_GUID_CMAKE:INTERNAL=B67E8B1B-A070-4C69-B784-59B7EA2719A4
1729-
//Stored GUID
1730-
install_FindCGAL_GUID_CMAKE:INTERNAL=1C4ECC6D-3981-4873-8437-D347F46BE90C
1731-
//Stored GUID
1732-
tests_GUID_CMAKE:INTERNAL=DA6AF244-32B2-4558-BE68-24D0E0512E1E
17331708

0 commit comments

Comments
 (0)