From 6fd8f9b9961fd76c767a6da8b43c5e7ef53a4bd4 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 23 May 2013 17:38:16 +0200 Subject: [PATCH] Add -D_HAS_ITERATOR_DEBUGGING=0 to Debug platforms --- .gitattributes | 1 + .../CMakeCache.txt | 6 +++--- .../CMakeCache.txt | 6 +++--- .../CMakeCache.txt | 6 +++--- .../CMakeCache.txt | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitattributes b/.gitattributes index fb76722523e..7ace2261490 100644 --- a/.gitattributes +++ b/.gitattributes @@ -44,6 +44,7 @@ Documentation/pkglist_filter text eol=lf *.bat text eol=crlf *.nsh text eol=crlf *.vcproj text eol=crlf +/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/*/CMakeCache.txt eol=crlf # Denote all files that are truly binary and should not be modified. *.png binary diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2008-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2008-Debug-64bits/CMakeCache.txt index 000a1f7512d..f2a4269620c 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2008-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2008-Debug-64bits/CMakeCache.txt @@ -60,7 +60,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-I-REF //User-defined flags -CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- +CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Dependencies for the target CGAL_Core_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-64/gmp-5.0.1_and_mpfr-3.0.0/lib/libmpfr-4.lib;general;C:/3rdPartyLibs/VC-64/gmp-5.0.1_and_mpfr-3.0.0/lib/libgmp-10.lib; @@ -128,7 +128,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin/x86_amd64/cl.exe //User-defined flags -CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- /bigobj +CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1 @@ -1270,7 +1270,7 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- +CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding GMP diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2010-Debug-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2010-Debug-32bits/CMakeCache.txt index b2616dddaef..9cdd056bae8 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2010-Debug-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2010-Debug-32bits/CMakeCache.txt @@ -60,7 +60,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-I-REF //User-defined flags -CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- +CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Dependencies for the target CGAL_Core_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libmpfr-4.lib;general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libgmp-10.lib; @@ -128,7 +128,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/cl.exe //User-defined flags -CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- /bigobj +CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1 @@ -1270,7 +1270,7 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- +CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding GMP diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt index fe29f836b8c..4ca5da21f52 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt @@ -60,7 +60,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-I-REF //User-defined flags -CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- +CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Dependencies for the target CGAL_Core_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libmpfr-4.lib;general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libgmp-10.lib; @@ -128,7 +128,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin/cl.exe //User-defined flags -CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- /bigobj +CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1 @@ -1270,7 +1270,7 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- +CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding GMP diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt index 092261ef438..abb9a925a61 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt @@ -60,7 +60,7 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-I-REF //User-defined flags -CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- +CGAL_CXX_FLAGS:STRING= -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Dependencies for the target CGAL_Core_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-64/gmp-5.0.1_and_mpfr-3.0.0/lib/libmpfr-4.lib;general;C:/3rdPartyLibs/VC-64/gmp-5.0.1_and_mpfr-3.0.0/lib/libgmp-10.lib; @@ -128,7 +128,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=ON CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin/amd64/cl.exe //User-defined flags -CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- /bigobj +CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1 @@ -1270,7 +1270,7 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /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- +CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm1000 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE -D_HAS_ITERATOR_DEBUGGING=0 -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- //Variable hidden from user EXECUTABLE_OUTPUT_PATH:INTERNAL= //Details about finding GMP