summaryrefslogtreecommitdiffstats
path: root/Source/cmConfigure.cmake.h.in
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-06-12 20:15:08 (GMT)
committerDaniel Pfeifer <daniel@pfeifer-mail.de>2016-06-13 20:37:28 (GMT)
commitc3819acad22c1bc0f763f7222648e8cade777ca6 (patch)
tree2f28c94ab342709e3056015a025fad06e9d7abde /Source/cmConfigure.cmake.h.in
parent1bafa0b3f5195d9a9c952f6ca4115fb8503f769b (diff)
downloadCMake-c3819acad22c1bc0f763f7222648e8cade777ca6.zip
CMake-c3819acad22c1bc0f763f7222648e8cade777ca6.tar.gz
CMake-c3819acad22c1bc0f763f7222648e8cade777ca6.tar.bz2
cmConfigure.h: Establish as 'include first' file
At the moment, cmStandardIncludes.h needs to be included before any standard includes because it disables some warnings that are caused by the standard library of some compilers. Move this responsibility to the cmConfigure.h file. Also add include guards to cmConfigure.h to make sure the file can be included multiple times.
Diffstat (limited to 'Source/cmConfigure.cmake.h.in')
-rw-r--r--Source/cmConfigure.cmake.h.in17
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 11ff00b..938b10e 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -9,6 +9,21 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#ifndef cmConfigure_h
+#define cmConfigure_h
+
+#include <cmsys/Configure.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4786)
+#pragma warning(disable : 4503)
+#endif
+
+#ifdef __ICL
+#pragma warning(disable : 985)
+#pragma warning(disable : 1572) /* floating-point equality test */
+#endif
+
#cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
@@ -17,3 +32,5 @@
#cmakedefine CMake_HAVE_CXX11_UNORDERED_MAP
#define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
#define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
+
+#endif
mit/?h=v4.8.5&id=01cd9579af3b0c3546b7b8a7d9e2bd37bd2e327b'>Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-188-17/+163 |\ \ \ \ | |_|_|/ |/| | | | * | | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1 | * | | Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6 | * | | Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0 | * | | ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124 | * | | Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-182-1/+32 | | |/ | |/| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-182-2/+10 |\ \ \ | * | | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-182-1/+6 | * | | qmake/symbian: Don't give the -u flag to cp on Mac OS X, it isn't a standard ...Martin Storsjo2010-10-181-1/+4 | |/ / * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-1810-21/+47 |\ \ \ | |/ / |/| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1884-1561/+2589 | |\ \ | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1620-103/+996 | | |\ \ | | | |/ | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1564-1458/+1593 | | |\ \ | * | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-182-3/+3 | |/ / / | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-1512-19/+163 | |\ \ \ | | * | | Changed language of the AutoConnection description.Jerome Pasion2010-10-151-5/+5 | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-154-9/+30 | | |\ \ \ | | | * \ \ Merge branch 'small' into 4.7Morten Engvoldsen2010-10-154-9/+30 | | | |\ \ \ | | | | * | | Doc: Clearing details around default settings.Morten Engvoldsen2010-10-141-0/+1 | | | | * | | Doc: making links more visible when they are visited.Morten Engvoldsen2010-10-141-0/+9 | | | | * | | Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18 | | | | * | | Doc: Adding note to tier 2: The ppc architecture on Mac has been downgraded f...Morten Engvoldsen2010-10-141-0/+2 | | * | | | | Changed Javascript guide link in Intro to the QML Language page.Jerome Pasion2010-10-152-3/+8 | | |/ / / / | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-145-2/+120 | | |\ \ \ \ | | | |/ / / | | |/| | | | * | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1 | |/ / / / * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-181-1/+64 |\ \ \ \ \ | |_|_|_|/ |/| | | | | * | | | Add additional documentation for the qmltime benchmark.Michael Brasser2010-10-181-1/+64 |/ / / / * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1632-163/+1063 |\ \ \ \ | |_|_|/ |/| | | | * | | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-162-19/+6 | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1534-169/+1082 | |\ \ \ |/ / / / | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1534-169/+1082 | |\ \ \ | | * | | Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37 | | * | | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-152-6/+19 | | * | | Fix tst_moduleqt47::accidentalImportOlivier Goffart2010-10-152-2/+2 | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-14