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, master has been updated
via 5c8d821ecabb0fba28719000182f241b16d86b44 (commit)
via f0005dacdeb04be2d3777735af938ff76d9e3ad5 (commit)
from 5a3f539cd50621298d15df639c29a9c09aace443 (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=5c8d821ecabb0fba28719000182f241b16d86b44
commit 5c8d821ecabb0fba28719000182f241b16d86b44
Merge: 5a3f539cd5 f0005dacde
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 25 13:37:39 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Oct 25 09:37:49 2019 -0400
Merge topic 'xcode-scheme-env'
f0005dacde Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3933
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0005dacdeb04be2d3777735af938ff76d9e3ad5
commit f0005dacdeb04be2d3777735af938ff76d9e3ad5
Author: Felix Heidrich <fe...@tulip.co>
AuthorDate: Thu Oct 17 12:45:20 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 24 11:24:34 2019 -0400
Xcode: Add CMAKE_XCODE_SCHEME_ENVIRONMENT variable
Initialize the `XCODE_SCHEME_ENVIRONMENT` target property.
This was left out of commit 6b7f1e1db0 (Xcode: Add variables and
properties to configure schemes, 2018-07-29, v3.13.0-rc1~243^2).
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index cad0df6daf..b5415b79dd 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -241,6 +241,7 @@ Variables that Change Behavior
/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER
/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS
/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE
+ /variable/CMAKE_XCODE_SCHEME_ENVIRONMENT
/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC
/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP
/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES
diff --git a/Help/release/dev/xcode-scheme-env.rst
b/Help/release/dev/xcode-scheme-env.rst
new file mode 100644
index 0000000000..238cb618fa
--- /dev/null
+++ b/Help/release/dev/xcode-scheme-env.rst
@@ -0,0 +1,5 @@
+xcode-scheme-env
+----------------
+
+* The :variable:`CMAKE_XCODE_SCHEME_ENVIRONMENT` variable was added
+ to initialize the :prop_tgt:`XCODE_SCHEME_ENVIRONMENT` target property.
diff --git a/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
b/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
new file mode 100644
index 0000000000..4832659ce7
--- /dev/null
+++ b/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
@@ -0,0 +1,15 @@
+CMAKE_XCODE_SCHEME_ENVIRONMENT
+------------------------------
+
+Specify environment variables that should be added to the Arguments
+section of the generated Xcode scheme.
+
+If set to a list of environment variables and values of the form
+``MYVAR=value`` those environment variables will be added to the
+scheme.
+
+This variable initializes the :prop_tgt:`XCODE_SCHEME_ENVIRONMENT`
+property on all targets.
+
+Please refer to the :prop_tgt:`XCODE_GENERATE_SCHEME` target property
+documentation to see all Xcode schema related properties.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 99c16f2374..472287f0e0 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -380,6 +380,7 @@ cmTarget::cmTarget(std::string const& name,
cmStateEnums::TargetType type,
initProp("XCODE_SCHEME_MALLOC_STACK");
initProp("XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE");
initProp("XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS");
+ initProp("XCODE_SCHEME_ENVIRONMENT");
}
#endif
}
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 1 +
Help/release/dev/xcode-scheme-env.rst | 5 +++++
.../CMAKE_XCODE_SCHEME_ENVIRONMENT.rst} | 7 +++++--
Source/cmTarget.cxx | 1 +
4 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/xcode-scheme-env.rst
copy Help/{prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst =>
variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst} (70%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
