diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index fa3ee417d..5a28e5679 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -4,6 +4,15 @@
 SET(CMAKE_BACKWARDS_COMPATIBILITY 1.4)
 PROJECT (Complex)
 
+# Choose whether to test CMakeLib.
+SET(COMPLEX_TEST_CMAKELIB 1)
+IF(CMAKE_TEST_DIFFERENT_GENERATOR)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(CMAKE_TEST_SYSTEM_LIBRARIES)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_SYSTEM_LIBRARIES)
+
 #
 # Define a macro
 #
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 28db54ea5..f61963a2f 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -6,14 +6,14 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
 
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   # Link to CMake lib
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
   # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to 
 SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
@@ -23,9 +23,9 @@ ADD_EXECUTABLE(A A.cxx A.hh A.h A.txt)
 ADD_EXECUTABLE(complex complex testcflags.c )
 #  Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
 ADD_EXECUTABLE(complex.file complex.file.cxx)
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 273e8a267..89c7dbdf1 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -8,7 +8,7 @@
 extern "C" {
 #include "testConly.h"
 }
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 #include "cmStandardIncludes.h"
 #include "cmSystemTools.h"
 #include "cmDynamicLoader.h"
@@ -64,7 +64,7 @@ void cmPassed(const char* Message, const char* m2="")
 This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 // Here is a stupid function that tries to use std::string methods
 // so that the dec cxx compiler will instantiate the stuff that
 // we are using from the CMakeLib library....
@@ -327,7 +327,7 @@ int main()
 #endif
   std::string exe = lib;
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // Test a single character executable to test a: in makefiles
   exe += "A";
   exe += cmSystemTools::GetExecutableExtension();
@@ -1059,7 +1059,7 @@ int main()
     }
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // ----------------------------------------------------------------------
   // Some pre-build/pre-link/post-build custom-commands have been
   // attached to the lib (see Library/).
@@ -1257,7 +1257,7 @@ int main()
   cmPassed("CMake SET CACHE FORCE");
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
   // first run with shouldFail = true, this will
   // run with A B C as set by the CMakeList.txt file.
   if(!TestLibraryOrder(true))
diff --git a/Tests/Complex/cmTestConfigure.h.in b/Tests/Complex/cmTestConfigure.h.in
index 0b1e181a3..80342036a 100644
--- a/Tests/Complex/cmTestConfigure.h.in
+++ b/Tests/Complex/cmTestConfigure.h.in
@@ -4,7 +4,8 @@
 #cmakedefine ONE_VAR_IS_DEFINED
 #cmakedefine ZERO_VAR
 
-#cmakedefine CMAKE_TEST_DIFFERENT_GENERATOR
+#cmakedefine COMPLEX_TEST_CMAKELIB
+
 #define STRING_VAR "${STRING_VAR}"
 
 // Test FOREACH
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index fa3ee417d..5a28e5679 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -4,6 +4,15 @@
 SET(CMAKE_BACKWARDS_COMPATIBILITY 1.4)
 PROJECT (Complex)
 
+# Choose whether to test CMakeLib.
+SET(COMPLEX_TEST_CMAKELIB 1)
+IF(CMAKE_TEST_DIFFERENT_GENERATOR)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(CMAKE_TEST_SYSTEM_LIBRARIES)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_SYSTEM_LIBRARIES)
+
 #
 # Define a macro
 #
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index 28db54ea5..f61963a2f 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
@@ -6,14 +6,14 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
 
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   # Link to CMake lib
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
   # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to 
 SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
@@ -23,9 +23,9 @@ ADD_EXECUTABLE(A A.cxx A.hh A.h A.txt)
 ADD_EXECUTABLE(complex complex testcflags.c )
 #  Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
 ADD_EXECUTABLE(complex.file complex.file.cxx)
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index 273e8a267..89c7dbdf1 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -8,7 +8,7 @@
 extern "C" {
 #include "testConly.h"
 }
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 #include "cmStandardIncludes.h"
 #include "cmSystemTools.h"
 #include "cmDynamicLoader.h"
@@ -64,7 +64,7 @@ void cmPassed(const char* Message, const char* m2="")
 This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 // Here is a stupid function that tries to use std::string methods
 // so that the dec cxx compiler will instantiate the stuff that
 // we are using from the CMakeLib library....
@@ -327,7 +327,7 @@ int main()
 #endif
   std::string exe = lib;
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // Test a single character executable to test a: in makefiles
   exe += "A";
   exe += cmSystemTools::GetExecutableExtension();
@@ -1059,7 +1059,7 @@ int main()
     }
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // ----------------------------------------------------------------------
   // Some pre-build/pre-link/post-build custom-commands have been
   // attached to the lib (see Library/).
@@ -1257,7 +1257,7 @@ int main()
   cmPassed("CMake SET CACHE FORCE");
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
   // first run with shouldFail = true, this will
   // run with A B C as set by the CMakeList.txt file.
   if(!TestLibraryOrder(true))
diff --git a/Tests/ComplexOneConfig/cmTestConfigure.h.in b/Tests/ComplexOneConfig/cmTestConfigure.h.in
index 0b1e181a3..80342036a 100644
--- a/Tests/ComplexOneConfig/cmTestConfigure.h.in
+++ b/Tests/ComplexOneConfig/cmTestConfigure.h.in
@@ -4,7 +4,8 @@
 #cmakedefine ONE_VAR_IS_DEFINED
 #cmakedefine ZERO_VAR
 
-#cmakedefine CMAKE_TEST_DIFFERENT_GENERATOR
+#cmakedefine COMPLEX_TEST_CMAKELIB
+
 #define STRING_VAR "${STRING_VAR}"
 
 // Test FOREACH
diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt
index fa3ee417d..5a28e5679 100644
--- a/Tests/ComplexRelativePaths/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/CMakeLists.txt
@@ -4,6 +4,15 @@
 SET(CMAKE_BACKWARDS_COMPATIBILITY 1.4)
 PROJECT (Complex)
 
+# Choose whether to test CMakeLib.
+SET(COMPLEX_TEST_CMAKELIB 1)
+IF(CMAKE_TEST_DIFFERENT_GENERATOR)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(CMAKE_TEST_SYSTEM_LIBRARIES)
+  SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_SYSTEM_LIBRARIES)
+
 #
 # Define a macro
 #
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
index 28db54ea5..f61963a2f 100644
--- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
@@ -6,14 +6,14 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
 
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   # Link to CMake lib
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
   # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to 
 SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
@@ -23,9 +23,9 @@ ADD_EXECUTABLE(A A.cxx A.hh A.h A.txt)
 ADD_EXECUTABLE(complex complex testcflags.c )
 #  Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
 ADD_EXECUTABLE(complex.file complex.file.cxx)
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
   TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx
index 273e8a267..89c7dbdf1 100644
--- a/Tests/ComplexRelativePaths/Executable/complex.cxx
+++ b/Tests/ComplexRelativePaths/Executable/complex.cxx
@@ -8,7 +8,7 @@
 extern "C" {
 #include "testConly.h"
 }
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 #include "cmStandardIncludes.h"
 #include "cmSystemTools.h"
 #include "cmDynamicLoader.h"
@@ -64,7 +64,7 @@ void cmPassed(const char* Message, const char* m2="")
 This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
 // Here is a stupid function that tries to use std::string methods
 // so that the dec cxx compiler will instantiate the stuff that
 // we are using from the CMakeLib library....
@@ -327,7 +327,7 @@ int main()
 #endif
   std::string exe = lib;
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // Test a single character executable to test a: in makefiles
   exe += "A";
   exe += cmSystemTools::GetExecutableExtension();
@@ -1059,7 +1059,7 @@ int main()
     }
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR  
+#ifdef CMAKE_TEST_CMAKELIB  
   // ----------------------------------------------------------------------
   // Some pre-build/pre-link/post-build custom-commands have been
   // attached to the lib (see Library/).
@@ -1257,7 +1257,7 @@ int main()
   cmPassed("CMake SET CACHE FORCE");
 #endif
 
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef CMAKE_TEST_CMAKELIB
   // first run with shouldFail = true, this will
   // run with A B C as set by the CMakeList.txt file.
   if(!TestLibraryOrder(true))
diff --git a/Tests/ComplexRelativePaths/cmTestConfigure.h.in b/Tests/ComplexRelativePaths/cmTestConfigure.h.in
index 0b1e181a3..80342036a 100644
--- a/Tests/ComplexRelativePaths/cmTestConfigure.h.in
+++ b/Tests/ComplexRelativePaths/cmTestConfigure.h.in
@@ -4,7 +4,8 @@
 #cmakedefine ONE_VAR_IS_DEFINED
 #cmakedefine ZERO_VAR
 
-#cmakedefine CMAKE_TEST_DIFFERENT_GENERATOR
+#cmakedefine COMPLEX_TEST_CMAKELIB
+
 #define STRING_VAR "${STRING_VAR}"
 
 // Test FOREACH