[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-467-g194307d
Kitware Robot
kwrobot at kitware.com
Sun Mar 12 17:25:03 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 194307d651eaa888861635f989e88dc14079c98b (commit)
via 3fd9f4ab0595f15588055fef1ad8dd8612945e22 (commit)
via cf13e495447662624c3389dc075fe48342f5e593 (commit)
from 69319443edbb3044781a467aa8da18cf30e323d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194307d651eaa888861635f989e88dc14079c98b
commit 194307d651eaa888861635f989e88dc14079c98b
Merge: 6931944 3fd9f4a
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Mar 12 21:16:12 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Mar 12 17:16:14 2017 -0400
Stage topic 'xcode-test-schema-generation'
Topic-id: 23011
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/577
diff --cc Help/manual/cmake-variables.7.rst
index e4ee725,04d9cbd..9d8d596
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@@ -84,9 -84,9 +84,10 @@@ Variables that Provide Informatio
/variable/CMAKE_VS_NsightTegra_VERSION
/variable/CMAKE_VS_PLATFORM_NAME
/variable/CMAKE_VS_PLATFORM_TOOLSET
+ /variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA
/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+ /variable/CMAKE_XCODE_GENERATE_SCHEME
/variable/CMAKE_XCODE_PLATFORM_TOOLSET
/variable/PROJECT-NAME_BINARY_DIR
/variable/PROJECT-NAME_SOURCE_DIR
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fd9f4ab0595f15588055fef1ad8dd8612945e22
commit 3fd9f4ab0595f15588055fef1ad8dd8612945e22
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Mar 12 21:23:26 2017 +0100
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Mar 12 21:27:53 2017 +0100
Xcode: Add test for schema generation
Closes: #15441
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index f51a107..5f4bdc3 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -187,3 +187,19 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_OPTIONS)
endif()
+
+function(XcodeSchemaGeneration)
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeSchemaGeneration-build)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ set(RunCMake_TEST_OPTIONS "-DCMAKE_XCODE_GENERATE_SCHEME=ON")
+
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+ run_cmake(XcodeSchemaGeneration)
+ run_cmake_command(XcodeSchemaGeneration-build xcodebuild -scheme foo build)
+endfunction()
+
+if(NOT XCODE_VERSION VERSION_LESS 7)
+ XcodeSchemaGeneration()
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeSchemaGeneration.cmake b/Tests/RunCMake/XcodeProject/XcodeSchemaGeneration.cmake
new file mode 100644
index 0000000..2fe5a9f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeSchemaGeneration.cmake
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.7)
+
+project(XcodeSchemaGeneration CXX)
+
+add_executable(foo main.cpp)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf13e495447662624c3389dc075fe48342f5e593
commit cf13e495447662624c3389dc075fe48342f5e593
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Feb 24 16:18:35 2017 +0100
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Mar 12 21:24:46 2017 +0100
Xcode: Control schema generation via variable
Issue: #15441
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 2157ba5..e07150a 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -46,7 +46,6 @@ Properties of Global Scope
/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS
/prop_gbl/USE_FOLDERS
/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
- /prop_gbl/XCODE_GENERATE_SCHEME
.. _`Directory Properties`:
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 2606ba0..04d9cbd 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -86,6 +86,7 @@ Variables that Provide Information
/variable/CMAKE_VS_PLATFORM_TOOLSET
/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+ /variable/CMAKE_XCODE_GENERATE_SCHEME
/variable/CMAKE_XCODE_PLATFORM_TOOLSET
/variable/PROJECT-NAME_BINARY_DIR
/variable/PROJECT-NAME_SOURCE_DIR
diff --git a/Help/release/dev/cmake-xcode-schemes.rst b/Help/release/dev/cmake-xcode-schemes.rst
index 27c19d7..81068ae 100644
--- a/Help/release/dev/cmake-xcode-schemes.rst
+++ b/Help/release/dev/cmake-xcode-schemes.rst
@@ -3,4 +3,4 @@ cmake-xcode-schemes
* The :generator:`Xcode` generator got the ability to create schema files.
This is still an experimental feature and can be activated by setting the
- :prop_gbl:`XCODE_GENERATE_SCHEME` global property to a ``TRUE`` value.
+ :variable:`CMAKE_XCODE_GENERATE_SCHEME` variable to a ``TRUE`` value.
diff --git a/Help/prop_gbl/XCODE_GENERATE_SCHEME.rst b/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
similarity index 82%
rename from Help/prop_gbl/XCODE_GENERATE_SCHEME.rst
rename to Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
index be8b5b0..c9fcc92 100644
--- a/Help/prop_gbl/XCODE_GENERATE_SCHEME.rst
+++ b/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
@@ -1,5 +1,5 @@
-XCODE_GENERATE_SCHEME
----------------------
+CMAKE_XCODE_GENERATE_SCHEME
+---------------------------
If enabled, the Xcode generator will generate schema files. Those are
are useful to invoke analyze, archive, build-for-testing and test
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b023d5c..77f3408 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3341,8 +3341,7 @@ void cmGlobalXCodeGenerator::OutputXCodeProject(
// Since the lowest available Xcode version for testing was 7.0,
// I'm setting this as a limit then
- if (this->GetCMakeInstance()->GetState()->GetGlobalPropertyAsBool(
- "XCODE_GENERATE_SCHEME") &&
+ if (root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_SCHEME") &&
this->XcodeVersion >= 70) {
this->OutputXCodeSharedSchemes(xcodeDir);
this->OutputXCodeWorkspaceSettings(xcodeDir);
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 -
Help/manual/cmake-variables.7.rst | 1 +
Help/release/dev/cmake-xcode-schemes.rst | 2 +-
.../CMAKE_XCODE_GENERATE_SCHEME.rst} | 4 ++--
Source/cmGlobalXCodeGenerator.cxx | 3 +--
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 16 ++++++++++++++++
.../RunCMake/XcodeProject/XcodeSchemaGeneration.cmake | 5 +++++
7 files changed, 26 insertions(+), 6 deletions(-)
rename Help/{prop_gbl/XCODE_GENERATE_SCHEME.rst => variable/CMAKE_XCODE_GENERATE_SCHEME.rst} (82%)
create mode 100644 Tests/RunCMake/XcodeProject/XcodeSchemaGeneration.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list