Просмотр исходного кода

ENH: Renamed NOT_IN_ALL to EXCLUDE_FROM_ALL.

Brad King 19 лет назад
Родитель
Сommit
fcd500289b

+ 1 - 1
Source/cmAddExecutableCommand.cxx

@@ -44,7 +44,7 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
       ++s;
       use_macbundle = true;
       }
-    else if(*s == "NOT_IN_ALL")
+    else if(*s == "EXCLUDE_FROM_ALL")
       {
       ++s;
       in_all = false;

+ 2 - 2
Source/cmAddExecutableCommand.h

@@ -62,7 +62,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  ADD_EXECUTABLE(exename [WIN32] [MACOSX_BUNDLE] [NOT_IN_ALL]\n"
+      "  ADD_EXECUTABLE(exename [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]\n"
       "                 source1 source2 ... sourceN)\n"
       "This command adds an executable target to the current directory.  "
       "The executable will be built from the list of source files "
@@ -86,7 +86,7 @@ public:
       "  MACOSX_BUNDLE_SHORT_VERSION_STRING\n"
       "  MACOSX_BUNDLE_BUNDLE_VERSION\n"
       "  MACOSX_BUNDLE_COPYRIGHT\n"
-      "If NOT_IN_ALL is given the target will not be built by default. "
+      "If EXCLUDE_FROM_ALL is given the target will not be built by default. "
       "It will be built only if the user explicitly builds the target or "
       "another target that requires the target depends on it."
       ;

+ 1 - 1
Source/cmAddLibraryCommand.cxx

@@ -57,7 +57,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
       ++s;
       shared = 2;
       }
-    else if(*s == "NOT_IN_ALL")
+    else if(*s == "EXCLUDE_FROM_ALL")
       {
       ++s;
       in_all = false;

+ 2 - 2
Source/cmAddLibraryCommand.h

@@ -61,7 +61,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  ADD_LIBRARY(libname [SHARED | STATIC | MODULE] [NOT_IN_ALL]\n"
+      "  ADD_LIBRARY(libname [SHARED | STATIC | MODULE] [EXCLUDE_FROM_ALL]\n"
       "              source1 source2 ... sourceN)\n"
       "Adds a library target.  SHARED, STATIC or MODULE keywords are used "
       "to set the library type.  If the keyword MODULE appears, the library "
@@ -70,7 +70,7 @@ public:
       " as the second argument, the type defaults to the current value of "
       "BUILD_SHARED_LIBS.  If this variable is not set, the type defaults "
       "to STATIC.\n"
-      "If NOT_IN_ALL is given the target will not be built by default. "
+      "If EXCLUDE_FROM_ALL is given the target will not be built by default. "
       "It will be built only if the user explicitly builds the target or "
       "another target that requires the target depends on it.";
     }

+ 1 - 1
Tests/Complex/Executable/CMakeLists.txt

@@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 # Test creating an executable that is not built by default.
-ADD_EXECUTABLE(notInAllExe NOT_IN_ALL notInAllExe.cxx)
+ADD_EXECUTABLE(notInAllExe EXCLUDE_FROM_ALL notInAllExe.cxx)
 TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
 
 # Test creating a custom target that builds not-in-all targets.

+ 1 - 1
Tests/Complex/Library/CMakeLists.txt

@@ -104,7 +104,7 @@ INSTALL_FILES(/tmp .h ${Complex_BINARY_DIR}/cmTestConfigure.h)
 INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
 
 # Test creating a library that is not built by default.
-ADD_LIBRARY(notInAllLib NOT_IN_ALL notInAllLib.cxx)
+ADD_LIBRARY(notInAllLib EXCLUDE_FROM_ALL notInAllLib.cxx)
 
 # Test generation of preprocessed sources.
 IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)

+ 1 - 1
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 # Test creating an executable that is not built by default.
-ADD_EXECUTABLE(notInAllExe NOT_IN_ALL notInAllExe.cxx)
+ADD_EXECUTABLE(notInAllExe EXCLUDE_FROM_ALL notInAllExe.cxx)
 TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
 
 # Test creating a custom target that builds not-in-all targets.

+ 1 - 1
Tests/ComplexOneConfig/Library/CMakeLists.txt

@@ -104,7 +104,7 @@ INSTALL_FILES(/tmp .h ${Complex_BINARY_DIR}/cmTestConfigure.h)
 INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
 
 # Test creating a library that is not built by default.
-ADD_LIBRARY(notInAllLib NOT_IN_ALL notInAllLib.cxx)
+ADD_LIBRARY(notInAllLib EXCLUDE_FROM_ALL notInAllLib.cxx)
 
 # Test generation of preprocessed sources.
 IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)

+ 1 - 1
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 # Test creating an executable that is not built by default.
-ADD_EXECUTABLE(notInAllExe NOT_IN_ALL notInAllExe.cxx)
+ADD_EXECUTABLE(notInAllExe EXCLUDE_FROM_ALL notInAllExe.cxx)
 TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
 
 # Test creating a custom target that builds not-in-all targets.

+ 1 - 1
Tests/ComplexRelativePaths/Library/CMakeLists.txt

@@ -104,7 +104,7 @@ INSTALL_FILES(/tmp .h ${Complex_BINARY_DIR}/cmTestConfigure.h)
 INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
 
 # Test creating a library that is not built by default.
-ADD_LIBRARY(notInAllLib NOT_IN_ALL notInAllLib.cxx)
+ADD_LIBRARY(notInAllLib EXCLUDE_FROM_ALL notInAllLib.cxx)
 
 # Test generation of preprocessed sources.
 IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)