kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Renamed NOT_IN_ALL to EXCLUDE_FROM_ALL.

This commit is contained in:
Brad King 2006-10-02 12:01:20 -04:00
parent 1d9f287af7
commit fcd500289b
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmAddExecutableCommand.cxx
View File

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

4
Source/cmAddExecutableCommand.h
View File

@ -62,7 +62,7 @@ public:
virtual const char* GetFullDocumentation() virtual const char* GetFullDocumentation()
{ {
return 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" " source1 source2 ... sourceN)\n"
"This command adds an executable target to the current directory. " "This command adds an executable target to the current directory. "
"The executable will be built from the list of source files " "The executable will be built from the list of source files "
@ -86,7 +86,7 @@ public:
" MACOSX_BUNDLE_SHORT_VERSION_STRING\n" " MACOSX_BUNDLE_SHORT_VERSION_STRING\n"
" MACOSX_BUNDLE_BUNDLE_VERSION\n" " MACOSX_BUNDLE_BUNDLE_VERSION\n"
" MACOSX_BUNDLE_COPYRIGHT\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 " "It will be built only if the user explicitly builds the target or "
"another target that requires the target depends on it." "another target that requires the target depends on it."
; ;

2
Source/cmAddLibraryCommand.cxx
View File

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

4
Source/cmAddLibraryCommand.h
View File

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

2
Tests/Complex/Executable/CMakeLists.txt
View File

@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
) )
# Test creating an executable that is not built by default. # 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) TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
# Test creating a custom target that builds not-in-all targets. # Test creating a custom target that builds not-in-all targets.

2
Tests/Complex/Library/CMakeLists.txt
View File

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

2
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
) )
# Test creating an executable that is not built by default. # 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) TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
# Test creating a custom target that builds not-in-all targets. # Test creating a custom target that builds not-in-all targets.

2
Tests/ComplexOneConfig/Library/CMakeLists.txt
View File

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

2
Tests/ComplexRelativePaths/Executable/CMakeLists.txt
View File

@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(
) )
# Test creating an executable that is not built by default. # 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) TARGET_LINK_LIBRARIES(notInAllExe notInAllLib)
# Test creating a custom target that builds not-in-all targets. # Test creating a custom target that builds not-in-all targets.

2
Tests/ComplexRelativePaths/Library/CMakeLists.txt
View File

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