diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-12 20:15:08 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-13 20:37:28 (GMT) |
| commit | c3819acad22c1bc0f763f7222648e8cade777ca6 (patch) | |
| tree | 2f28c94ab342709e3056015a025fad06e9d7abde | |
| parent | 1bafa0b3f5195d9a9c952f6ca4115fb8503f769b (diff) | |
| download | CMake-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.
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 17 | ||||
| -rw-r--r-- | Source/cmStandardIncludes.h | 12 |
2 files changed, 17 insertions, 12 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 diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index d3bf301..5ff221d 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -18,18 +18,6 @@ #include <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 - // Provide fixed-size integer types. #include <cm_kwiml.h> |