diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-05 20:38:28 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-01-11 17:06:04 +0100 |
| commit | 5e92c82655e7430bef6604c90b3389f6609c2bdf (patch) | |
| tree | 5ad641c1a77a1c2050943b914e3d1d5917e573a3 | |
| parent | 15e42bb27c75e90da8163b89ad8fdc0a8fd70d7a (diff) | |
| download | cmake-5e92c82655e7430bef6604c90b3389f6609c2bdf.tar.gz | |
Remove some obsolete stuff.
We don't need to run compiler tests for ansi-for etc anymore. All
supported compilers support the features tested here.
| -rw-r--r-- | CompileFlags.cmake | 2 | ||||
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 4 | ||||
| -rwxr-xr-x | bootstrap | 29 |
3 files changed, 0 insertions, 35 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake index e7beb3f5b0..153ba6a47d 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -83,5 +83,3 @@ endif () if (CMAKE_ANSI_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}") endif () - -include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 79776f4c79..c0a1aa955c 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -9,10 +9,6 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#cmakedefine CMAKE_NO_STD_NAMESPACE -#cmakedefine CMAKE_NO_ANSI_STREAM_HEADERS -#cmakedefine CMAKE_NO_ANSI_STRING_STREAM -#cmakedefine CMAKE_NO_ANSI_FOR_SCOPE #cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE #cmakedefine HAVE_UNSETENV #cmakedefine CMAKE_USE_ELF_PARSER @@ -1461,35 +1461,6 @@ cmake_compiler_settings_comment="/* cmake_report cmConfigure.h${_tmp} "${cmake_compiler_settings_comment}" -if [ "x$KWSYS_STL_HAVE_STD" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_STD_NAMESPACE */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_STD_NAMESPACE 1" -fi - -if [ "x$KWSYS_IOS_USE_ANSI" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STREAM_HEADERS */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STREAM_HEADERS 1" -fi - -if [ "x$KWSYS_IOS_USE_SSTREAM" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STRING_STREAM */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STRING_STREAM 1" -fi - -# Test for ansi FOR scope -if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags}" \ - "${cmake_source_dir}/Modules/TestForAnsiForScope.cxx" >> cmake_bootstrap.log 2>&1; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_FOR_SCOPE */" - echo "${cmake_cxx_compiler} has ANSI for scoping" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_FOR_SCOPE 1" - echo "${cmake_cxx_compiler} does not have ANSI for scoping" -fi - # When bootstrapping on MinGW with MSYS we must convert the source # directory to a windows path. if ${cmake_system_mingw}; then |