ENH: Removed CMAKE_GENERATOR_NEW now that the old unix makefile generator is never used.

7 files changed, 37 insertions, 56 deletions

diff --git a/Modules/Platform/Darwin-xlc.cmake b/Modules/Platform/Darwin-xlc.cmake
index ebe099b..f7e4da3 100644
--- a/Modules/Platform/Darwin-xlc.cmake
+++ b/Modules/Platform/Darwin-xlc.cmake
@@ -1,8 +1,6 @@
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
 SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle")
 
-IF(CMAKE_GENERATOR_NEW)
-  # Enable shared library versioning.
-  SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-install_name")
-  SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-install_name")
-ENDIF(CMAKE_GENERATOR_NEW)
+# Enable shared library versioning.
+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-install_name")
+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-install_name")
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index e3b8890..8148e30 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -12,38 +12,31 @@ IF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
     "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
 ENDIF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
 
-IF(CMAKE_GENERATOR_NEW)
-  # Enable shared library versioning.
-  SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
-  SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name")
+# Enable shared library versioning.
+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name")
 
-  # OSX does not really implement an rpath, but it does allow a path to
-  # be specified in the soname field of a dylib.
-  IF(CMAKE_SKIP_RPATH)
-    # No rpath requested.  Just use the soname directly.
-    SET(CMAKE_C_CREATE_SHARED_LIBRARY
-      "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG> <TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
-    SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
-      "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG> <TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
-  ELSE(CMAKE_SKIP_RPATH)
-    # Support for rpath is requested.  Approximate it by putting the
-    # full path to the library in the soname field.  Then when executables
-    # link the library they will copy this full path as the name to use
-    # to find the library.  We can get the directory containing the library
-    # by using the dirname of the <TARGET>.  It may be a relative path
-    # so we use a "cd ...;pwd" trick to convert it to a full path at
-    # build time.
-    SET(CMAKE_C_CREATE_SHARED_LIBRARY
-      "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG> \"`cd \\`dirname <TARGET>\\`\;pwd`/<TARGET_SONAME>\" <OBJECTS> <LINK_LIBRARIES>")
-    SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
-      "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG> \"`cd \\`dirname <TARGET>\\`\;pwd`/<TARGET_SONAME>\" <OBJECTS> <LINK_LIBRARIES>")
-  ENDIF(CMAKE_SKIP_RPATH)
-ELSE(CMAKE_GENERATOR_NEW)
+# OSX does not really implement an rpath, but it does allow a path to
+# be specified in the soname field of a dylib.
+IF(CMAKE_SKIP_RPATH)
+  # No rpath requested.  Just use the soname directly.
+  SET(CMAKE_C_CREATE_SHARED_LIBRARY
+    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG> <TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
   SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
-    "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+    "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG> <TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+ELSE(CMAKE_SKIP_RPATH)
+  # Support for rpath is requested.  Approximate it by putting the
+  # full path to the library in the soname field.  Then when executables
+  # link the library they will copy this full path as the name to use
+  # to find the library.  We can get the directory containing the library
+  # by using the dirname of the <TARGET>.  It may be a relative path
+  # so we use a "cd ...;pwd" trick to convert it to a full path at
+  # build time.
   SET(CMAKE_C_CREATE_SHARED_LIBRARY
-    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-ENDIF(CMAKE_GENERATOR_NEW)
+    "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG> \"`cd \\`dirname <TARGET>\\`\;pwd`/<TARGET_SONAME>\" <OBJECTS> <LINK_LIBRARIES>")
+  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
+    "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG> \"`cd \\`dirname <TARGET>\\`\;pwd`/<TARGET_SONAME>\" <OBJECTS> <LINK_LIBRARIES>")
+ENDIF(CMAKE_SKIP_RPATH)
 
 SET(CMAKE_CXX_CREATE_SHARED_MODULE
       "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 477004c..46fdec3 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -30,7 +30,6 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>co
                                                       cmMakefile *mf)
 {
   std::string outdir = m_CMakeInstance->GetStartOutputDirectory();
-  mf->AddDefinition("CMAKE_GENERATOR_NEW", "1");
   mf->AddDefinition("BORLAND", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); 
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 198211b..fad31c3 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -28,7 +28,6 @@ void cmGlobalNMakeMakefileGenerator::EnableLanguage(std::vector<std::string>cons
                                                     cmMakefile *mf)
 {
   // pick a default 
-  mf->AddDefinition("CMAKE_GENERATOR_NEW", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
   this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf);
diff --git a/Source/cmGlobalUnixMakefileGenerator.cxx b/Source/cmGlobalUnixMakefileGenerator.cxx
index e4b7f51..14ea749 100644
--- a/Source/cmGlobalUnixMakefileGenerator.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator.cxx
@@ -31,7 +31,6 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(std::vector<std::string>const
                                                    cmMakefile *mf)
 {
   mf->AddDefinition("CMAKE_CFG_INTDIR",".");
-  mf->AddDefinition("CMAKE_GENERATOR_NEW", "1");
   this->cmGlobalGenerator::EnableLanguage(languages, mf);
   std::string path;
   for(std::vector<std::string>::const_iterator l = languages.begin();
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index 57634cf..99132de 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -7,9 +7,9 @@ MESSAGE("CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}")
 MESSAGE("CMAKE_Fortran_FLAGS = ${CMAKE_Fortran_FLAGS}")
 ADD_EXECUTABLE(testf hello.f)
 
-IF(CMAKE_Fortran_COMPILER_SUPPORTS_F90 AND CMAKE_GENERATOR_NEW)
+IF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
   ADD_EXECUTABLE(test_module
     test_module_main.f90
     test_module_implementation.f90
     test_module_interface.f90)
-ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90 AND CMAKE_GENERATOR_NEW)
+ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
diff --git a/Tests/MakeClean/ToClean/CMakeLists.txt b/Tests/MakeClean/ToClean/CMakeLists.txt
index 673bbc4..622a861 100644
--- a/Tests/MakeClean/ToClean/CMakeLists.txt
+++ b/Tests/MakeClean/ToClean/CMakeLists.txt
@@ -5,13 +5,8 @@ ADD_EXECUTABLE(toclean toclean.cxx)
 
 # List some build-time-generated files.
 GET_TARGET_PROPERTY(TOCLEAN_FILES toclean LOCATION)
-IF(CMAKE_GENERATOR_NEW)
-  SET(TOCLEAN_FILES ${TOCLEAN_FILES}
-    "${ToClean_BINARY_DIR}/toclean.dir/toclean${CMAKE_CXX_OUTPUT_EXTENSION}")
-ELSE(CMAKE_GENERATOR_NEW)
-  SET(TOCLEAN_FILES ${TOCLEAN_FILES}
-    "${ToClean_BINARY_DIR}/toclean${CMAKE_CXX_OUTPUT_EXTENSION}")
-ENDIF(CMAKE_GENERATOR_NEW)
+SET(TOCLEAN_FILES ${TOCLEAN_FILES}
+  "${ToClean_BINARY_DIR}/toclean.dir/toclean${CMAKE_CXX_OUTPUT_EXTENSION}")
 
 # Create a file that must be registered for cleaning.
 FILE(WRITE "${ToClean_BINARY_DIR}/Registered.txt"
@@ -21,16 +16,14 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
 SET(TOCLEAN_FILES ${TOCLEAN_FILES} "${ToClean_BINARY_DIR}/Registered.txt")
 
 # Create a custom command whose output should be cleaned.
-IF(CMAKE_GENERATOR_NEW)
-  ADD_CUSTOM_COMMAND(OUTPUT ${ToClean_BINARY_DIR}/generated.txt
-    DEPENDS ${ToClean_SOURCE_DIR}/toclean.cxx
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy ${ToClean_SOURCE_DIR}/toclean.cxx
-                 ${ToClean_BINARY_DIR}/generated.txt
-    )
-  ADD_CUSTOM_TARGET(generate ALL DEPENDS ${ToClean_BINARY_DIR}/generated.txt)
-  SET(TOCLEAN_FILES ${TOCLEAN_FILES} "${ToClean_BINARY_DIR}/generated.txt")
-ENDIF(CMAKE_GENERATOR_NEW)
+ADD_CUSTOM_COMMAND(OUTPUT ${ToClean_BINARY_DIR}/generated.txt
+  DEPENDS ${ToClean_SOURCE_DIR}/toclean.cxx
+  COMMAND ${CMAKE_COMMAND}
+  ARGS -E copy ${ToClean_SOURCE_DIR}/toclean.cxx
+               ${ToClean_BINARY_DIR}/generated.txt
+  )
+ADD_CUSTOM_TARGET(generate ALL DEPENDS ${ToClean_BINARY_DIR}/generated.txt)
+SET(TOCLEAN_FILES ${TOCLEAN_FILES} "${ToClean_BINARY_DIR}/generated.txt")
 
 # Configure a file listing these build-time-generated files.
 CONFIGURE_FILE(${ToClean_SOURCE_DIR}/ToCleanFiles.cmake.in