diff options
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 | ||||
| -rw-r--r-- | Tests/CFBundleTest/README.txt | 2 | ||||
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/SourceGroups/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/TestsWorkingDirectory/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/TestsWorkingDirectory/subdir/CMakeLists.txt | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index e284967086..ca063d54c9 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -266,7 +266,7 @@ IF(UNIX) SET(SRCS ${SRCS} cmGlobalKdevelopGenerator.cxx) ENDIF(UNIX) -# XCode only works on apple +# Xcode only works on Apple IF(APPLE) SET(SRCS ${SRCS} cmXCodeObject.cxx diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d5c0fefdcf..1077afde6f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -147,7 +147,7 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New() } return gg.release(); #else - std::cerr << "CMake should be built with cmake to use XCode, " + std::cerr << "CMake should be built with cmake to use Xcode, " "default to Xcode 1.5\n"; return new cmGlobalXCodeGenerator; #endif @@ -963,7 +963,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, this->CreateString("0")); } - // create list of build phases and create the XCode target + // create list of build phases and create the Xcode target cmXCodeObject* buildPhases = this->CreateObject(cmXCodeObject::OBJECT_LIST); @@ -2883,7 +2883,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( makefileStream << "# DO NOT EDIT\n"; makefileStream << "# This makefile makes sure all linkable targets are\n"; makefileStream << "# up-to-date with anything they link to, avoiding a " - "bug in XCode 1.5\n"; + "bug in Xcode 1.5\n"; for(std::vector<std::string>::const_iterator ct = this->CurrentConfigurationTypes.begin(); ct != this->CurrentConfigurationTypes.end(); ++ct) @@ -3112,7 +3112,7 @@ void cmGlobalXCodeGenerator::GetDocumentation(cmDocumentationEntry& entry) const { entry.Name = this->GetName(); - entry.Brief = "Generate XCode project files."; + entry.Brief = "Generate Xcode project files."; entry.Full = ""; } diff --git a/Tests/CFBundleTest/README.txt b/Tests/CFBundleTest/README.txt index 248651b449..86c146333a 100644 --- a/Tests/CFBundleTest/README.txt +++ b/Tests/CFBundleTest/README.txt @@ -1,5 +1,5 @@ -CFBundle test project. The generated .plugin/ bundle from either makefiles or XCode should look like this: +CFBundle test project. The generated .plugin/ bundle from either makefiles or Xcode should look like this: ./Contents ./Contents/Info.plist diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 5fc6550643..564db9ff15 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -294,7 +294,7 @@ ELSE(STAGE2) "${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake;${CMAKE_INSTALL_PREFIX}/InstallScript4Out.cmake") SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe) - # Disable VERSION test until it is implemented in the XCode generator. + # Disable VERSION test until it is implemented in the Xcode generator. IF(NOT XCODE) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) ENDIF(NOT XCODE) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 5fc6550643..564db9ff15 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -294,7 +294,7 @@ ELSE(STAGE2) "${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake;${CMAKE_INSTALL_PREFIX}/InstallScript4Out.cmake") SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe) - # Disable VERSION test until it is implemented in the XCode generator. + # Disable VERSION test until it is implemented in the Xcode generator. IF(NOT XCODE) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) ENDIF(NOT XCODE) diff --git a/Tests/SourceGroups/CMakeLists.txt b/Tests/SourceGroups/CMakeLists.txt index e57e0192ef..c3cf38c7a6 100644 --- a/Tests/SourceGroups/CMakeLists.txt +++ b/Tests/SourceGroups/CMakeLists.txt @@ -5,7 +5,7 @@ project(SourceGroups) # it is more an example with several source_group() # commands. # The created projects have to be loaded manually -# in Visual Studio/XCode/Eclipse/... +# in Visual Studio/Xcode/Eclipse/... # to see whether the correct groups have been created. source_group(Base FILES main.c) diff --git a/Tests/TestsWorkingDirectory/CMakeLists.txt b/Tests/TestsWorkingDirectory/CMakeLists.txt index a0fd18a697..6a6e9b6c7c 100644 --- a/Tests/TestsWorkingDirectory/CMakeLists.txt +++ b/Tests/TestsWorkingDirectory/CMakeLists.txt @@ -23,7 +23,7 @@ set_tests_properties(WorkingDirectory2 PROPERTIES set(_default_cwd "${CMAKE_BINARY_DIR}") -# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +# FIXME: How to deal with /debug, /release, etc. with VS or Xcode? if(${CMAKE_GENERATOR} MATCHES "Makefiles") add_test(WorkingDirectory3 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd}) endif() @@ -34,7 +34,7 @@ string(REGEX REPLACE "/[^/]*$" "" _parent_dir "${CMAKE_BINARY_DIR}") add_test(NAME WorkingDirectory5 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/.. COMMAND WorkingDirectory ${_parent_dir}) -# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +# FIXME: How to deal with /debug, /release, etc. with VS or Xcode? if(${CMAKE_GENERATOR} MATCHES "Makefiles") add_test(WorkingDirectory6 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..) endif() diff --git a/Tests/TestsWorkingDirectory/subdir/CMakeLists.txt b/Tests/TestsWorkingDirectory/subdir/CMakeLists.txt index 523f02e44a..c16b1db43a 100644 --- a/Tests/TestsWorkingDirectory/subdir/CMakeLists.txt +++ b/Tests/TestsWorkingDirectory/subdir/CMakeLists.txt @@ -14,7 +14,7 @@ set_tests_properties(WorkingDirectory-Subdir2 PROPERTIES set(_default_cwd "${CMAKE_CURRENT_BINARY_DIR}") -# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +# FIXME: How to deal with /debug, /release, etc. with VS or Xcode? if(${CMAKE_GENERATOR} MATCHES "Makefiles") add_test(WorkingDirectory-Subdir3 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd}) endif() @@ -25,7 +25,7 @@ string(REGEX REPLACE "/[^/]*$" "" _parent_dir "${CMAKE_CURRENT_BINARY_DIR}") add_test(NAME WorkingDirectory-Subdir5 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.. COMMAND WorkingDirectory ${_parent_dir}) -# FIXME: How to deal with /debug, /release, etc. with VS or XCode? +# FIXME: How to deal with /debug, /release, etc. with VS or Xcode? if(${CMAKE_GENERATOR} MATCHES "Makefiles") add_test(WorkingDirectory-Subdir6 ${EXECUTABLE_OUTPUT_PATH}/WorkingDirectory ${_default_cwd} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..) endif() |