from:"Gregor Jasny via Cmake\-commits"

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-654-g7f38595

2017-03-01 Thread Gregor Jasny via Cmake-commits

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  7f38595c96edc9059776b1e8fe3b409f1082b45a (commit)
   via  54a48c6781dd02f2ebbdb19a77c9a4fb59e67735 (commit)
   via  f4977d056b2295679ce723c639f16823cfe489d5 (commit)
   via  7202db5db46bfe7499244af315249820e883c8cf (commit)
   via  5995082101a1959f303f9f3d6c0a1e483630749e (commit)
   via  6a54d28e44c3e539a0f6b45a5bdd748df5ef29ca (commit)
  from  0412b809f4d426ad1826c10e7f4b2d172906b0ee (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=7f38595c96edc9059776b1e8fe3b409f1082b45a
commit 7f38595c96edc9059776b1e8fe3b409f1082b45a
Merge: 0412b80 54a48c6
Author: Gregor Jasny 
AuthorDate: Wed Mar 1 05:13:29 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 05:13:29 2017 -0500

Merge topic 'xcode-enhance-schemes' into next

54a48c67 Xcode: Use proper buildable name for schema
f4977d05 Xcode: Select executable target for execution in schema
7202db5d Xcode: Fix schema container location calculation
59950821 Xcode: Do not autocreate schemes
6a54d28e Xcode: Use proper indentation for schemes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
commit 54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
Author: Gregor Jasny 
AuthorDate: Sat Feb 25 21:26:17 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:30 2017 +0100

Xcode: Use proper buildable name for schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index 1596e5c..5c22531 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -15,6 +15,7 @@ cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  unsigned int xcVersion)
   : Target(xcObj)
   , TargetName(xcObj->GetTarget()->GetName())
+  , BuildableName(xcObj->GetTarget()->GetFullName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -87,7 +88,7 @@ void cmXCodeScheme::WriteBuildAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
@@ -149,7 +150,7 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
diff --git a/Source/cmXCodeScheme.h b/Source/cmXCodeScheme.h
index 470b5fd..0a8e737 100644
--- a/Source/cmXCodeScheme.h
+++ b/Source/cmXCodeScheme.h
@@ -26,6 +26,7 @@ public:
 private:
   const cmXCodeObject* const Target;
   const std::string& TargetName;
+  const std::string BuildableName;
   const std::string& TargetId;
   const std::vector& ConfigList;
   const unsigned int XcodeVersion;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4977d056b2295679ce723c639f16823cfe489d5
commit f4977d056b2295679ce723c639f16823cfe489d5
Author: Gregor Jasny 
AuthorDate: Fri Feb 24 18:47:58 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:29 2017 +0100

Xcode: Select executable target for execution in schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index e5031fd..1596e5c 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -13,7 +13,8 @@
 cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  const std::vector& configList,
  unsigned int xcVersion)
-  : TargetName(xcObj->GetTarget()->GetName())
+  : Target(xcObj)
+  , TargetName(xcObj->GetTarget()->GetName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -135,7 +136,14 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.Attribute("debugServiceExtension", "internal");
   xout.Attribute("allowLocationSimulation", "YES");
 
-  xout.StartElement("MacroExpansion");
+  if (IsExecutable(this->Target)) {
+

[Cmake-commits] CMake branch, next, updated. v3.7.1-1875-g040e28b

2016-12-29 Thread Gregor Jasny via Cmake-commits

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  040e28be7c196697a103e19725d1c9ef392d2471 (commit)
   via  fd466d3fd3070b36aadbd7457ddb644b33d40a61 (commit)
   via  2da3ae3bf76def94d3177f963703e3672ee27f1c (commit)
  from  f090b7818791116d3bd273403a91531e9a14d3fc (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=040e28be7c196697a103e19725d1c9ef392d2471
commit 040e28be7c196697a103e19725d1c9ef392d2471
Merge: f090b78 fd466d3
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 17:12:59 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 29 17:12:59 2016 -0500

Merge topic 'read-only-type-target-property' into next

fd466d3f cmTarget: Enforce TYPE being a read-only property
2da3ae3b CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd466d3fd3070b36aadbd7457ddb644b33d40a61
commit fd466d3fd3070b36aadbd7457ddb644b33d40a61
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 23:11:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Dec 29 23:11:50 2016 +0100

cmTarget: Enforce TYPE being a read-only property

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee4ff39..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,6 +858,12 @@ void cmTarget::SetProperty(const std::string& prop, const 
char* value)
 this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
 return;
   }
+  if (prop == "TYPE") {
+std::ostringstream e;
+e << "TYPE property is read-only\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
 std::ostringstream e;
 e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake 
b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 37c7124..1ddacee 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,4 +6,5 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
+run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt 
b/Tests/RunCMake/set_property/TYPE-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt 
b/Tests/RunCMake/set_property/TYPE-stderr.txt
new file mode 100644
index 000..6226051
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-stderr.txt
@@ -0,0 +1 @@
+TYPE property is read-only
\ No newline at end of file
diff --git a/Tests/RunCMake/set_property/TYPE.cmake 
b/Tests/RunCMake/set_property/TYPE.cmake
new file mode 100644
index 000..8481266
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE.cmake
@@ -0,0 +1,2 @@
+add_custom_target(CustomTarget)
+set_property(TARGET CustomTarget PROPERTY TYPE foo)

---

Summary of changes:
 Source/CMakeVersion.cmake|2 +-
 Source/cmTarget.cxx  |6 ++
 Tests/RunCMake/set_property/RunCMakeTest.cmake   |1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}   |0
 Tests/RunCMake/set_property/TYPE-stderr.txt  |1 +
 Tests/RunCMake/set_property/TYPE.cmake   |2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.cmake


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.1-1870-g2969f55

2016-12-29 Thread Gregor Jasny via Cmake-commits

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  2969f55026a2bb77f063c6c119a9c9e3afc35854 (commit)
   via  8263a78cab321419a6d8839e78317673cd2779a2 (commit)
  from  3c5549e5d6d8b3651f7696e5f9daade18ffab621 (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=2969f55026a2bb77f063c6c119a9c9e3afc35854
commit 2969f55026a2bb77f063c6c119a9c9e3afc35854
Merge: 3c5549e 8263a78
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 05:07:28 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 29 05:07:28 2016 -0500

Merge topic '16253-xcode-effective-platform-name' into next

8263a78c fixup! Xcode: Always emit EFFECTIVE_PLATFORM_NAME


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8263a78cab321419a6d8839e78317673cd2779a2
commit 8263a78cab321419a6d8839e78317673cd2779a2
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 10:55:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Dec 29 10:55:50 2016 +0100

fixup! Xcode: Always emit EFFECTIVE_PLATFORM_NAME

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index aeda728..c2a76e4 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const 
std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-bool isXcode = this->Makefile->IsOn("XCODE");
+bool useEPN = this->Makefile->ShouldEmitEffectivePlatformName();
 std::string suffix =
-  usesDefaultOutputDir && isXcode ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+  usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
 this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
   "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 828a0ca..c2767f0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
 singleLine.push_back(cmd);
 if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
   std::string cfgArg = "-DBUILD_TYPE=";
-  bool isXcode = mf->IsOn("XCODE");
-  if (isXcode) {
+  bool useEPN = mf->ShouldEmitEffectivePlatformName();
+  if (useEPN) {
 cfgArg += "$(CONFIGURATION)";
 singleLine.push_back(cfgArg);
 cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fccb486..0656b0a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,6 +2184,22 @@ bool cmMakefile::PlatformIsAppleIos() const
   return false;
 }
 
+bool cmMakefile::ShouldEmitEffectivePlatformName() const
+{
+  bool isXcode = this->IsOn("XCODE");
+  if (!isXcode) {
+return false;
+  }
+
+  const char* xcodeVersion = this->GetDefinition("XCODE_VERSION");
+  if (!xcodeVersion ||
+  cmSystemTools::VersionCompareGreater("5", xcodeVersion)) {
+return false;
+  }
+
+  return true;
+}
+
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
 {
   std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3484e5a..f929951 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -427,6 +427,9 @@ public:
   /** Return whether the target platform is Apple iOS.  */
   bool PlatformIsAppleIos() const;
 
+  /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME.  */
+  bool ShouldEmitEffectivePlatformName() const;
+
   /** Retrieve soname flag for the specified language if supported */
   const char* GetSONameFlag(const std::string& language) const;
 

---

Summary of changes:
 Source/cmGeneratorTarget.cxx |4 ++--
 Source/cmGlobalGenerator.cxx |4 ++--
 Source/cmMakefile.cxx|   16 
 Source/cmMakefile.h  |3 +++
 4 files changed, 23 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.1-1866-g54fd083

2016-12-28 Thread Gregor Jasny via Cmake-commits

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  54fd0836989e2a4bb8711265499e09e6ffd5c3d8 (commit)
   via  bf5b0b18cb543bd25e43fe27373851fa70befe26 (commit)
  from  3738245c7b170b3d16ac54b53bbfa08d8d321fff (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=54fd0836989e2a4bb8711265499e09e6ffd5c3d8
commit 54fd0836989e2a4bb8711265499e09e6ffd5c3d8
Merge: 3738245 bf5b0b1
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 14:40:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 28 14:40:27 2016 -0500

Merge topic '16204-regex-explorer-match-all' into next

bf5b0b18 fixup! cmake-gui: Add MATCHALL option to Regex Explorer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf5b0b18cb543bd25e43fe27373851fa70befe26
commit bf5b0b18cb543bd25e43fe27373851fa70befe26
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 20:37:18 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Dec 28 20:39:30 2016 +0100

fixup! cmake-gui: Add MATCHALL option to Regex Explorer

diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index 52b0b84..abed70e 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -119,6 +119,8 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int 
index)
 
 void RegexExplorer::on_matchAll_toggled(bool checked)
 {
+  Q_UNUSED(checked);
+
   on_inputText_textChanged();
 }
 

---

Summary of changes:
 Source/QtDialog/RegexExplorer.cxx |2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.7.1-1864-g3738245

2016-12-28 Thread Gregor Jasny via Cmake-commits

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  3738245c7b170b3d16ac54b53bbfa08d8d321fff (commit)
   via  df364bf8e78f533dc2267ae281cf4a67c040813e (commit)
   via  58a09969f84eadd0f06adee33d3aaba09da26229 (commit)
  from  f96cd09de6efbf13d9662eb99fe5911c36fd0ebb (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=3738245c7b170b3d16ac54b53bbfa08d8d321fff
commit 3738245c7b170b3d16ac54b53bbfa08d8d321fff
Merge: f96cd09 df364bf
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 13:40:44 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 28 13:40:44 2016 -0500

Merge topic '16253-xcode-effective-platform-name' into next

df364bf8 Xcode: Always emit EFFECTIVE_PLATFORM_NAME
58a09969 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df364bf8e78f533dc2267ae281cf4a67c040813e
commit df364bf8e78f533dc2267ae281cf4a67c040813e
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 23:42:14 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Dec 28 19:39:23 2016 +0100

Xcode: Always emit EFFECTIVE_PLATFORM_NAME

Closes: cmake/cmake#16253

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b6db0d6..aeda728 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const 
std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-bool iosPlatform = this->Makefile->PlatformIsAppleIos();
+bool isXcode = this->Makefile->IsOn("XCODE");
 std::string suffix =
-  usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+  usesDefaultOutputDir && isXcode ? "${EFFECTIVE_PLATFORM_NAME}" : "";
 this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
   "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2808051..828a0ca 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
 singleLine.push_back(cmd);
 if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
   std::string cfgArg = "-DBUILD_TYPE=";
-  bool iosPlatform = mf->PlatformIsAppleIos();
-  if (iosPlatform) {
+  bool isXcode = mf->IsOn("XCODE");
+  if (isXcode) {
 cfgArg += "$(CONFIGURATION)";
 singleLine.push_back(cfgArg);
 cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 60912c2..57766db 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -18,6 +18,27 @@ run_cmake(PerConfigPerSourceFlags)
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS)
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeMultiplatform)
+
+  run_cmake_command(XcodeMultiplatform-macosx-build ${CMAKE_COMMAND} --build . 
-- -sdk macosx)
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-build ${CMAKE_COMMAND} 
--build . -- -sdk iphonesimulator)
+
+  run_cmake_command(XcodeMultiplatform-macosx-install ${CMAKE_COMMAND} --build 
. --target install -- -sdk macosx 
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_macosx)
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-install 
${CMAKE_COMMAND} --build . --target install -- -sdk iphonesimulator 
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_iphonesimulator)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 5)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS 
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
diff --git a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake 
b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
new file mode 100644
index 000..166ce85
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.3)
+enable_language(CXX)
+

[Cmake-commits] CMake branch, next, updated. v3.7.1-1861-gf96cd09

2016-12-27 Thread Gregor Jasny via Cmake-commits

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  f96cd09de6efbf13d9662eb99fe5911c36fd0ebb (commit)
   via  88f07fb417a25f98662da2abf09a9db03f48eb7f (commit)
  from  4c3b6121f4cd46550db6f2e00359b779ba54735e (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=f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
commit f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
Merge: 4c3b612 88f07fb
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 16:25:18 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 16:25:18 2016 -0500

Merge topic '15687-revisit-xcode-system-include' into next

88f07fb4 Xcode: Properly mark SYSTEM includes as such


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88f07fb417a25f98662da2abf09a9db03f48eb7f
commit 88f07fb417a25f98662da2abf09a9db03f48eb7f
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 22:18:30 2016 +0100
Commit: Gregor Jasny 
CommitDate: Tue Dec 27 22:18:30 2016 +0100

Xcode: Properly mark SYSTEM includes as such

We now populate the per-language flags in addition to the header
search paths stored in HEADER_SEARCH_PATHS. This preserves include
paths for GNU assembly files (cmake/cmake#16449) and also provides
SYSTEM include semantics.

Closes: cmake/cmake#15687

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 736aa91..96535eb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1977,6 +1977,22 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 buildSettings->AddAttribute("HEADER_SEARCH_PATHS", dirs.CreateList());
   }
 
+  if (this->XcodeVersion >= 60) {
+// Add those per-language flags in addition to HEADER_SEARCH_PATHS to gain
+// system include directory awareness. We need to also keep on setting
+// HEADER_SEARCH_PATHS to work around a missing compile options flag for
+// GNU assembly files (#16449)
+for (std::set::iterator li = languages.begin();
+ li != languages.end(); ++li) {
+  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
+includes, gtgt, *li, true, false, configName);
+
+  if (!includeFlags.empty()) {
+cflags[*li] += " " + includeFlags;
+  }
+}
+  }
+
   bool same_gflags = true;
   std::map gflags;
   std::string const* last_gflag = 0;
diff --git a/Tests/IncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/CMakeLists.txt
index 4920582..db18462 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -3,7 +3,9 @@ project(IncludeDirectories)
 
 if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION 
VERSION_GREATER 4.4)
 OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL 
AppleClang)
-AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL 
"Ninja"))
+AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles"
+  OR CMAKE_GENERATOR STREQUAL "Ninja"
+  OR (CMAKE_GENERATOR STREQUAL "Xcode" AND NOT XCODE_VERSION VERSION_LESS 
6.0)))
   include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-Wunused-variable run_sys_includes_test)
   if(run_sys_includes_test)
diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
index dcee85e..5078f30 100644
--- a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
@@ -15,10 +15,17 @@ target_include_directories(upstream SYSTEM PUBLIC
 )
 
 add_library(config_specific INTERFACE)
-set(testConfig ${CMAKE_BUILD_TYPE})
-target_include_directories(config_specific SYSTEM INTERFACE
-  "$<$:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
-)
+if(CMAKE_GENERATOR STREQUAL "Xcode")
+  # CMAKE_BUILD_TYPE does not work here for multi-config generators
+  target_include_directories(config_specific SYSTEM INTERFACE
+"${CMAKE_CURRENT_SOURCE_DIR}/config_specific"
+  )
+else()
+  set(testConfig ${CMAKE_BUILD_TYPE})
+  target_include_directories(config_specific SYSTEM INTERFACE
+"$<$:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
+  )
+endif()
 
 add_library(consumer consumer.cpp)
 target_link_libraries(consumer upstream config_specific)

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx

[Cmake-commits] CMake branch, next, updated. v3.7.1-1859-g4c3b612

2016-12-27 Thread Gregor Jasny via Cmake-commits

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  4c3b6121f4cd46550db6f2e00359b779ba54735e (commit)
   via  fb55dc9d5b7a7e70770a783f41ec21c734f1fce7 (commit)
   via  65fb0fa63279b96035a144fd2f6413d1b2def47f (commit)
   via  2b301e11e2402690c43a7535656cba487559bd1f (commit)
   via  8b623e8a4af7451c718f448c8e27ce2b82347f76 (commit)
   via  df00ed13107ecb5e5b61ec07bb4190de0aaeb6b0 (commit)
  from  1890504c1220777f247462f00d9889a6d242e4bd (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=4c3b6121f4cd46550db6f2e00359b779ba54735e
commit 4c3b6121f4cd46550db6f2e00359b779ba54735e
Merge: 1890504 fb55dc9
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 10:43:15 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 10:43:15 2016 -0500

Merge topic '16204-regex-explorer-match-all' into next

fb55dc9d cmake-gui: Add MATCHALL option to Regex Explorer
65fb0fa6 CMake Nightly Date Stamp
2b301e11 CMake Nightly Date Stamp
8b623e8a CMake Nightly Date Stamp
df00ed13 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
commit fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 16:38:09 2016 +0100
Commit: Gregor Jasny 
CommitDate: Tue Dec 27 16:38:18 2016 +0100

cmake-gui: Add MATCHALL option to Regex Explorer

Closes: #16204

diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index 1512166..52b0b84 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -64,10 +64,32 @@ void RegexExplorer::on_inputText_textChanged()
 return;
   }
 
+  std::string matchingText;
+
+  if (matchAll->isChecked()) {
+const char* p = m_text.c_str();
+while (m_regexParser.find(p)) {
+  std::string::size_type l = m_regexParser.start();
+  std::string::size_type r = m_regexParser.end();
+  if (r - l == 0) {
+// matched empty string
+clearMatch();
+return;
+  }
+  if (!matchingText.empty()) {
+matchingText += ";";
+  }
+  matchingText += std::string(p + l, r - l);
+  p += r;
+}
+  } else {
+matchingText = m_regexParser.match(0);
+  }
+
 #ifdef QT_NO_STL
-  QString matchText = m_regexParser.match(0).c_str();
+  QString matchText = matchingText.c_str();
 #else
-  QString matchText = QString::fromStdString(m_regexParser.match(0));
+  QString matchText = QString::fromStdString(matchingText);
 #endif
   match0->setPlainText(matchText);
 
@@ -95,8 +117,14 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int 
index)
   matchN->setPlainText(match);
 }
 
+void RegexExplorer::on_matchAll_toggled(bool checked)
+{
+  on_inputText_textChanged();
+}
+
 void RegexExplorer::clearMatch()
 {
+  m_matched = false;
   match0->clear();
   matchN->clear();
 }
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index f1c1e5f..caef975 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -22,6 +22,7 @@ private slots:
   void on_regularExpression_textChanged(const QString& text);
   void on_inputText_textChanged();
   void on_matchNumber_currentIndexChanged(int index);
+  void on_matchAll_toggled(bool checked);
 
 private:
   static void setStatusColor(QWidget* widget, bool successful);
diff --git a/Source/QtDialog/RegexExplorer.ui b/Source/QtDialog/RegexExplorer.ui
index 2c2d761..0af6 100644
--- a/Source/QtDialog/RegexExplorer.ui
+++ b/Source/QtDialog/RegexExplorer.ui
@@ -104,11 +104,38 @@
 


-
- 
-  Complete Match
- 
-
+
+ 
+  
+   
+Complete Match
+   
+  
+ 
+ 
+  
+   
+Qt::Horizontal
+   
+   
+QSizePolicy::Fixed
+   
+   
+
+ 40
+ 20
+
+   
+  
+ 
+ 
+  
+   
+Match All
+   
+  
+ 
+


 

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/QtDialog/RegexExplorer.cxx |   32 ++--
 Source/QtDialog/RegexExplorer.h   |1 +
 Source/QtDialog/RegexExplorer.ui  |   37 -
 4 files changed, 64 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list

[Cmake-commits] CMake branch, next, updated. v3.7.1-1690-g2e29d71

2016-12-10 Thread Gregor Jasny via Cmake-commits

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  2e29d71c33f54eb84b1fae5bbb3c362b4f994f29 (commit)
   via  0ae4632119ba5300995ec5ddd5513a44bfd2a198 (commit)
   via  7ecac703cec8bde71f8d11c1a8fa34bfa077edee (commit)
  from  3ab7ed32396004ac7534e466657bbfb7f95b8a76 (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=2e29d71c33f54eb84b1fae5bbb3c362b4f994f29
commit 2e29d71c33f54eb84b1fae5bbb3c362b4f994f29
Merge: 3ab7ed3 0ae4632
Author: Gregor Jasny 
AuthorDate: Sat Dec 10 12:40:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Dec 10 12:40:27 2016 -0500

Merge topic 'xcode-message-extension' into next

0ae46321 Xcode: Add target property to override explicitFileType
7ecac703 Xcode: Add target property to override productType


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae4632119ba5300995ec5ddd5513a44bfd2a198
commit 0ae4632119ba5300995ec5ddd5513a44bfd2a198
Author: Gregor Jasny 
AuthorDate: Sat Dec 3 23:45:55 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Dec 4 00:13:51 2016 +0100

Xcode: Add target property to override explicitFileType

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 292a85b..70bd279 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -294,6 +294,7 @@ Properties on Targets
/prop_tgt/WIN32_EXECUTABLE
/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
+   /prop_tgt/XCODE_EXPLICIT_FILE_TYPE
/prop_tgt/XCODE_PRODUCT_TYPE
/prop_tgt/XCTEST
 
diff --git a/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst 
b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
new file mode 100644
index 000..dc92902
--- /dev/null
+++ b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
@@ -0,0 +1,8 @@
+XCODE_EXPLICIT_FILE_TYPE
+
+
+Set the Xcode ``explicitFileType`` attribute on its reference to a
+target.  CMake computes a default based on target type but
+can be told explicitly with this property.
+
+See also :prop_tgt:`XCODE_PRODUCT_TYPE`.
diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst 
b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
index 1fbf001..f4ef5c0 100644
--- a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
+++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
@@ -4,3 +4,5 @@ XCODE_PRODUCT_TYPE
 Set the Xcode ``productType`` attribute on its reference to a
 target.  CMake computes a default based on target type but
 can be told explicitly with this property.
+
+See also :prop_tgt:`XCODE_EXPLICIT_FILE_TYPE`.
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 82ca7a8..736aa91 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2313,6 +2313,10 @@ const char* 
cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
 const char* cmGlobalXCodeGenerator::GetTargetFileType(
   cmGeneratorTarget* target)
 {
+  if (const char* e = target->GetProperty("XCODE_EXPLICIT_FILE_TYPE")) {
+return e;
+  }
+
   switch (target->GetType()) {
 case cmStateEnums::OBJECT_LIBRARY:
 case cmStateEnums::STATIC_LIBRARY:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ecac703cec8bde71f8d11c1a8fa34bfa077edee
commit 7ecac703cec8bde71f8d11c1a8fa34bfa077edee
Author: Gregor Jasny 
AuthorDate: Sat Dec 3 23:46:15 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Dec 4 00:13:08 2016 +0100

Xcode: Add target property to override productType

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index e55524c..292a85b 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -294,6 +294,7 @@ Properties on Targets
/prop_tgt/WIN32_EXECUTABLE
/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
+   /prop_tgt/XCODE_PRODUCT_TYPE
/prop_tgt/XCTEST
 
 .. _`Test Properties`:
diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst 
b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
new file mode 100644
index 000..1fbf001
--- /dev/null
+++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
@@ -0,0 +1,6 @@
+XCODE_PRODUCT_TYPE
+--
+
+Set the Xcode ``productType`` attribute on its reference to a
+target.  CMake computes a default based on target type but
+can be told explicitly with this property.
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 50197c9..82ca7a8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++

[Cmake-commits] CMake branch, next, updated. v3.7.0-1322-g86d0d04

2016-11-23 Thread Gregor Jasny via Cmake-commits

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  86d0d04211c1102be5449a18825aec645c7b6942 (commit)
   via  82564914ff697b04cbc1f4978f9569ba14b33203 (commit)
   via  8288d16126193e86bb6880a7d7b749649ad83e2c (commit)
  from  6e51a624401016e1df34a70e273574ba0ab1bcf5 (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=86d0d04211c1102be5449a18825aec645c7b6942
commit 86d0d04211c1102be5449a18825aec645c7b6942
Merge: 6e51a62 8256491
Author: Gregor Jasny 
AuthorDate: Wed Nov 23 12:38:17 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Nov 23 12:38:17 2016 -0500

Merge topic '16449-revert-xcode-system-includes' into next

82564914 Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
8288d161 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82564914ff697b04cbc1f4978f9569ba14b33203
commit 82564914ff697b04cbc1f4978f9569ba14b33203
Author: Gregor Jasny 
AuthorDate: Wed Nov 23 18:19:54 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Nov 23 18:19:54 2016 +0100

Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"

This reverts commit 93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
and restores include flags handling for GNU assembly files.

Closes: #16449

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 84a8c5e..4a75b4d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1925,40 +1925,24 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
   BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
+  std::vector includes;
+  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
+ configName);
   std::set emitted;
   emitted.insert("/System/Library/Frameworks");
 
-  if (this->XcodeVersion < 60) {
-std::vector includes;
-this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
-   configName);
-for (std::vector::iterator i = includes.begin();
- i != includes.end(); ++i) {
-  if (this->NameResolvesToFramework(*i)) {
-std::string frameworkDir = *i;
-frameworkDir += "/../";
-frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
-if (emitted.insert(frameworkDir).second) {
-  fdirs.Add(this->XCodeEscapePath(frameworkDir));
-}
-  } else {
-std::string incpath = this->XCodeEscapePath(*i);
-dirs.Add(incpath);
-  }
-}
-  } else {
-for (std::set::iterator li = languages.begin();
- li != languages.end(); ++li) {
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li,
- configName);
-  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
-includes, gtgt, *li, true, false, configName);
-
-  std::string& flags = cflags[*li];
-  if (!includeFlags.empty()) {
-flags += " " + includeFlags;
+  for (std::vector::iterator i = includes.begin();
+   i != includes.end(); ++i) {
+if (this->NameResolvesToFramework(*i)) {
+  std::string frameworkDir = *i;
+  frameworkDir += "/../";
+  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
+  if (emitted.insert(frameworkDir).second) {
+fdirs.Add(this->XCodeEscapePath(frameworkDir));
   }
+} else {
+  std::string incpath = this->XCodeEscapePath(*i);
+  dirs.Add(incpath);
 }
   }
   // Add framework search paths needed for linking.
diff --git a/Tests/IncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/CMakeLists.txt
index db18462..4920582 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -3,9 +3,7 @@ project(IncludeDirectories)
 
 if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION 
VERSION_GREATER 4.4)
 OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL 
AppleClang)
-AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles"
-  OR CMAKE_GENERATOR STREQUAL "Ninja"
-  OR (CMAKE_GENERATOR STREQUAL "Xcode" AND NOT XCODE_VERSION VERSION_LESS 
6.0)))
+AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL 
"Ninja"))
   include(CheckCXXCompilerFlag)

[Cmake-commits] CMake branch, next, updated. v3.7.0-1247-ga3fb155

2016-11-17 Thread Gregor Jasny via Cmake-commits

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  a3fb155f636bbe567353b34b62c766ee19c43dae (commit)
   via  c0e223cd2ad78abc698c517004101a3eb48214c4 (commit)
  from  077c70d310c18d7f93ca926e166316d645d30e7e (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=a3fb155f636bbe567353b34b62c766ee19c43dae
commit a3fb155f636bbe567353b34b62c766ee19c43dae
Merge: 077c70d c0e223c
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 16:40:11 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 16:40:11 2016 -0500

Merge topic 'xcode-add-override-keyword' into next

c0e223cd Xcode: Add override keyword to suppress warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0e223cd2ad78abc698c517004101a3eb48214c4
commit c0e223cd2ad78abc698c517004101a3eb48214c4
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 22:39:46 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Nov 17 22:39:46 2016 +0100

Xcode: Add override keyword to suppress warnings

diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index ded8073..98625d1 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -23,7 +23,7 @@ public:
   static cmGlobalGeneratorFactory* NewFactory();
 
   ///! Get the name for the generator.
-  virtual std::string GetName() const
+  std::string GetName() const CM_OVERRIDE
   {
 return cmGlobalXCodeGenerator::GetActualName();
   }
@@ -33,51 +33,53 @@ public:
   static void GetDocumentation(cmDocumentationEntry& entry);
 
   ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf);
+  cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) CM_OVERRIDE;
 
   /**
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
-  virtual void EnableLanguage(std::vector const& languages,
-  cmMakefile*, bool optional);
+  void EnableLanguage(std::vector const& languages, cmMakefile*,
+  bool optional) CM_OVERRIDE;
   /**
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
*/
-  virtual void GenerateBuildCommand(
-std::vector& makeCommand, const std::string& makeProgram,
-const std::string& projectName, const std::string& projectDir,
-const std::string& targetName, const std::string& config, bool fast,
-bool verbose,
-std::vector const& makeOptions = std::vector());
+  void GenerateBuildCommand(std::vector& makeCommand,
+const std::string& makeProgram,
+const std::string& projectName,
+const std::string& projectDir,
+const std::string& targetName,
+const std::string& config, bool fast, bool verbose,
+std::vector const& makeOptions =
+  std::vector()) CM_OVERRIDE;
 
   /** Append the subdirectory for the given configuration.  */
-  virtual void AppendDirectoryForConfig(const std::string& prefix,
-const std::string& config,
-const std::string& suffix,
-std::string& dir);
+  void AppendDirectoryForConfig(const std::string& prefix,
+const std::string& config,
+const std::string& suffix,
+std::string& dir) CM_OVERRIDE;
 
   bool FindMakeProgram(cmMakefile*) CM_OVERRIDE;
 
   ///! What is the configurations directory variable called?
-  virtual const char* GetCMakeCFGIntDir() const;
+  const char* GetCMakeCFGIntDir() const CM_OVERRIDE;
   ///! expand CFGIntDir
-  virtual std::string ExpandCFGIntDir(const std::string& str,
-  const std::string& config) const;
+  std::string ExpandCFGIntDir(const std::string& str,
+  const std::string& config) const CM_OVERRIDE;
 
   void SetCurrentLocalGenerator(cmLocalGenerator*);
 
   /** Return true if the generated build tree may contain multiple builds.
   i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig() const;
+  bool IsMultiConfig() const CM_OVERRIDE;
 
-  virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
+

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-828-gd3c45a8

2016-10-31 Thread Gregor Jasny via Cmake-commits

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  d3c45a83f489137874715c4a7d0c4f6f50a9cc13 (commit)
   via  32737a1de163185236e867e10a276e60334a0836 (commit)
   via  e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff (commit)
   via  098a18c476b5e60b3bacc0e47f23359fc4a3ea2c (commit)
  from  4b4bebc7e19687ff9d1d28374555e647e5b1a634 (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=d3c45a83f489137874715c4a7d0c4f6f50a9cc13
commit d3c45a83f489137874715c4a7d0c4f6f50a9cc13
Merge: 4b4bebc 32737a1
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 07:25:11 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 31 07:25:11 2016 -0400

Merge topic 'fix-macos-sysroot' into next

32737a1d Darwin: Remove deployment target version check
e52e454f Revert "Xcode: Convert maybe unversioned OSX sysroot into 
versioned SDK path"
098a18c4 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32737a1de163185236e867e10a276e60334a0836
commit 32737a1de163185236e867e10a276e60334a0836
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 10:29:44 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Oct 31 12:24:20 2016 +0100

Darwin: Remove deployment target version check

Querying the SDK version via

  xcodebuild -sdk  -version Path

gives bogus results for the Command Line Tools installed into /.
Instead of adding another work-around I find it cleaner to remove
the deployment target version check altogether.

Resolves: 
http://public.kitware.com/pipermail/cmake-developers/2016-October/029539.html
Resolves: #16323

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 3606144..b539e45 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -113,7 +113,6 @@ set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE 
${_CMAKE_OSX_SYSROOT
   "The product will be built against the headers and libraries located inside 
the indicated SDK.")
 
 # Transform the cached value to something we can use.
-set(_CMAKE_OSX_SYSROOT_ORIG "${CMAKE_OSX_SYSROOT}")
 set(_CMAKE_OSX_SYSROOT_PATH "")
 if(CMAKE_OSX_SYSROOT)
   if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")
@@ -122,7 +121,6 @@ if(CMAKE_OSX_SYSROOT)
   message(WARNING "Ignoring CMAKE_OSX_SYSROOT value:\n 
${CMAKE_OSX_SYSROOT}\n"
 "because the directory does not exist.")
   set(CMAKE_OSX_SYSROOT "")
-  set(_CMAKE_OSX_SYSROOT_ORIG "")
 endif()
 set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
   else()
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index c09bac4..727baa6 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -64,30 +64,6 @@ if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
   mark_as_advanced(CMAKE_INSTALL_NAME_TOOL)
 endif()
 
-# Make sure the combination of SDK and Deployment Target are allowed
-if(CMAKE_OSX_DEPLOYMENT_TARGET)
-  if("${_CMAKE_OSX_SYSROOT_PATH}" MATCHES 
"/MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk")
-set(_sdk_ver "${CMAKE_MATCH_1}")
-  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
-set(_sdk_ver "${CMAKE_MATCH_1}")
-  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
-set(_sdk_ver "${_CURRENT_OSX_VERSION}")
-  else()
-message(FATAL_ERROR
-  "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
-  "but CMAKE_OSX_SYSROOT:\n \"${_CMAKE_OSX_SYSROOT_ORIG}\"\n"
-  "is not set to a MacOSX SDK with a recognized version.  "
-  "Either set CMAKE_OSX_SYSROOT to a valid SDK or set "
-  "CMAKE_OSX_DEPLOYMENT_TARGET to empty.")
-  endif()
-  if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER "${_sdk_ver}")
-message(FATAL_ERROR
-  "CMAKE_OSX_DEPLOYMENT_TARGET (${CMAKE_OSX_DEPLOYMENT_TARGET}) "
-  "is greater than CMAKE_OSX_SYSROOT SDK:\n ${_CMAKE_OSX_SYSROOT_ORIG}\n"
-  "Please set CMAKE_OSX_DEPLOYMENT_TARGET to ${_sdk_ver} or lower.")
-  endif()
-endif()
-
 # Enable shared library versioning.
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff
commit e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 10:25:38 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Oct 31 10:25:38 2016 +0100

Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-549-ga23f4f0

2016-10-16 Thread Gregor Jasny via Cmake-commits

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  a23f4f0666fdbfb7ab75635f62e216b5d5d158d0 (commit)
   via  9ce8fbf522e84f3f596e90453b4c652514a00099 (commit)
  from  54379cab91d6b2d6940d65fa8dd31530bd30ae52 (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=a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
commit a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
Merge: 54379ca 9ce8fbf
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 15:32:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Oct 16 15:32:13 2016 -0400

Merge topic 'refactor-folder-name-retrieval' into next

9ce8fbf5 Refactor IDE folder name retrieval into GetEffectiveFolderName()


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce8fbf522e84f3f596e90453b4c652514a00099
commit 9ce8fbf522e84f3f596e90453b4c652514a00099
Author: Gregor Jasny 
AuthorDate: Tue Aug 30 20:55:37 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Oct 16 21:27:47 2016 +0200

Refactor IDE folder name retrieval into GetEffectiveFolderName()

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7eb0ebf..eb9f419 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1767,6 +1767,22 @@ std::string cmGeneratorTarget::GetMacContentDirectory(
   return fpath;
 }
 
+std::string cmGeneratorTarget::GetEffectiveFolderName() const
+{
+std::string effectiveFolder;
+
+if (!this->GlobalGenerator->UseFolderProperty()) {
+return effectiveFolder;
+}
+
+const char* targetFolder = this->GetProperty("FOLDER");
+if (targetFolder) {
+effectiveFolder += targetFolder;
+}
+
+return effectiveFolder;
+}
+
 cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
   const std::string& config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 68ffd5c..9382726 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -220,6 +220,9 @@ public:
   std::string GetMacContentDirectory(const std::string& config = CM_NULLPTR,
  bool implib = false) const;
 
+  /** @return folder prefix for IDEs. */
+  std::string GetEffectiveFolderName() const;
+
   cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalGenerator* LocalGenerator;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx 
b/Source/cmGhsMultiTargetGenerator.cxx
index 5fbaea4..3154f8d 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -44,9 +44,7 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 std::string cmGhsMultiTargetGenerator::GetRelBuildFilePath(
   const cmGeneratorTarget* target)
 {
-  std::string output;
-  char const* folderProp = target->GetProperty("FOLDER");
-  output = NULL == folderProp ? "" : folderProp;
+  std::string output = target->GetEffectiveFolderName();
   cmSystemTools::ConvertToUnixSlashes(output);
   if (!output.empty()) {
 output += "/";
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1aa6af1..7d0c2da 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2377,7 +2377,7 @@ const char* 
cmGlobalGenerator::GetPredefinedTargetsFolder()
   return "CMakePredefinedTargets";
 }
 
-bool cmGlobalGenerator::UseFolderProperty()
+bool cmGlobalGenerator::UseFolderProperty() const
 {
   const char* prop =
 this->GetCMakeInstance()->GetState()->GetGlobalProperty("USE_FOLDERS");
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 38eaa76..c3498e0 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -334,6 +334,8 @@ public:
   i.e. "Can I build Debug and Release in the same tree?" */
   virtual bool IsMultiConfig() const { return false; }
 
+  virtual bool UseFolderProperty() const;
+
   std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;
 
   /** Generate an .rule file path for a given command output.  */
@@ -463,7 +465,6 @@ protected:
 std::string const& name) const;
 
   const char* GetPredefinedTargetsFolder();
-  virtual bool UseFolderProperty();
 
 private:
 #if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx 
b/Source/cmGlobalGhsMultiGenerator.cxx
index 0eac338..d4ae677 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -439,11 +439,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
tgtsI != tgts.end(); ++tgtsI) {
 const cmGeneratorTarget* tgt =

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-547-g54379ca

2016-10-16 Thread Gregor Jasny via Cmake-commits

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  54379cab91d6b2d6940d65fa8dd31530bd30ae52 (commit)
   via  25dbc485565649f54d64b57f6a35b651b8a15165 (commit)
   via  5ebba228823ffc96e82f4b6cc1103c2f2ed8cfa7 (commit)
   via  ac5b80e76c102d43749555c9bc888f9ac9b7436e (commit)
  from  1ebf57341d671befa62b4065b7565a01f1fe06aa (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=54379cab91d6b2d6940d65fa8dd31530bd30ae52
commit 54379cab91d6b2d6940d65fa8dd31530bd30ae52
Merge: 1ebf573 25dbc48
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 15:24:51 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Oct 16 15:24:51 2016 -0400

Merge topic '16355-osx-deployment-target-on-cross-compile' into next

25dbc485 Darwin: Do not try to set deployment target when crosscompiling 
(#16355)
5ebba228 CMake Nightly Date Stamp
ac5b80e7 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25dbc485565649f54d64b57f6a35b651b8a15165
commit 25dbc485565649f54d64b57f6a35b651b8a15165
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 20:56:36 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Oct 16 20:59:27 2016 +0200

Darwin: Do not try to set deployment target when crosscompiling (#16355)

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 427909d..39374e1 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -90,7 +90,7 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
   endif()
 endforeach()
 
-if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS 
_CMAKE_OSX_DEPLOYMENT_TARGET)
+if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_DEPLOYMENT_TARGET AND 
_CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
   set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
 "Minimum OS X version to target for deployment (at runtime); newer 
APIs weak linked. Set to empty string for default value." FORCE)
 endif()

---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |2 +-
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.2-2461-gd1bc55f

2016-09-25 Thread Gregor Jasny via Cmake-commits

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  d1bc55fd7228dd433eb457ec2d2dd38721694151 (commit)
   via  540815eec2b83a8b43689580c54e8950d9f5868b (commit)
   via  02277aef1081478192cc4669093665a01febc7ef (commit)
  from  7ee381d0f5f46674cab4e9554236d6249010655d (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=d1bc55fd7228dd433eb457ec2d2dd38721694151
commit d1bc55fd7228dd433eb457ec2d2dd38721694151
Merge: 7ee381d 540815e
Author: Gregor Jasny 
AuthorDate: Sun Sep 25 07:08:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 25 07:08:08 2016 -0400

Merge topic 'xcode-sdk-version' into next

540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK 
path
02277aef CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=540815eec2b83a8b43689580c54e8950d9f5868b
commit 540815eec2b83a8b43689580c54e8950d9f5868b
Author: Gregor Jasny 
AuthorDate: Sun Sep 25 11:37:34 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 25 13:06:23 2016 +0200

Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path

Starting with Xcode 8 the SDK folder also contains an unversioned
entry:

$ ls -l 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs

drwxr-xr-x  5 root  wheel  170 Mar  4  2018 MacOSX.sdk
lrwxr-xr-x  1 root  wheel   10 Sep 16 20:49 MacOSX10.12.sdk -> MacOSX.sdk

If this unversioned path is used CMake cannot detect the SDK
version. To work around the problem we always invoke the code path
that translates short SDK names like "macosx10.12" into a path.
That way we always end up with a versioned SDK path in
_CMAKE_OSX_SYSROOT_PATH which is later used to determine the version.

Closes: #16323

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 91c2cf3..427909d 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT)
   set(_CMAKE_OSX_SYSROOT_ORIG "")
 endif()
 set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
-  else()
-# Transform the sdk name into a path.
+  endif()
+
+  if(CMAKE_OSX_SYSROOT)
+# Transform the (maybe unversioned) sysroot into a versioned path.
 execute_process(
   COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
   OUTPUT_VARIABLE _stdout

---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |6 --
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.1-1760-gb8ececb

2016-09-04 Thread Gregor Jasny via Cmake-commits

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  b8ececb4b62f0fe2bb3fa7000bf00df327d76de5 (commit)
   via  60dcaaea133931a323180c30eafabe4576e72cb8 (commit)
   via  fb357e5fef2e7803f2f745b6aa4cf63935628ed6 (commit)
  from  dfa796fc2815c89ed7a1fcc119b12bcf6afc8294 (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=b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
commit b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
Merge: dfa796f 60dcaae
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 10:56:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 4 10:56:09 2016 -0400

Merge topic 'tidy-readability-redundant-string-cstr' into next

60dcaaea tidy: Fix readability-redundant-string-cstr issues
fb357e5f CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60dcaaea133931a323180c30eafabe4576e72cb8
commit 60dcaaea133931a323180c30eafabe4576e72cb8
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 16:55:05 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 4 16:55:05 2016 +0200

tidy: Fix readability-redundant-string-cstr issues

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 640e437..14436da 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -330,8 +330,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& 
src_dir,
   if (!cpack_dmg_disable_applications_symlink) {
 std::ostringstream application_link;
 application_link << staging.str() << "/Applications";
-cmSystemTools::CreateSymlink("/Applications",
- application_link.str().c_str());
+cmSystemTools::CreateSymlink("/Applications", application_link.str());
   }
 
   // Optionally add a custom volume icon ...
@@ -755,7 +754,7 @@ std::string 
cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(
 // the current COMPONENT belongs to.
 std::string groupVar =
   "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
-const char* _groupName = GetOption(groupVar.c_str());
+const char* _groupName = GetOption(groupVar);
 if (_groupName) {
   std::string groupName = _groupName;
 
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx 
b/Source/CPack/cmCPackOSXX11Generator.cxx
index c0d2553..c36439f 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -102,15 +102,14 @@ int cmCPackOSXX11Generator::PackageFiles()
   }
 
   std::string applicationsLinkName = diskImageDirectory + "/Applications";
-  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
+  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName);
 
-  if (!this->CopyResourcePlistFile("VolumeIcon.icns",
-   diskImageDirectory.c_str(),
+  if (!this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory,
".VolumeIcon.icns", true) ||
-  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
-   ".DS_Store", true) ||
+  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory, ".DS_Store",
+   true) ||
   !this->CopyResourcePlistFile("background.png",
-   diskImageBackgroundImageDir.c_str(),
+   diskImageBackgroundImageDir,
"background.png", true) ||
   !this->CopyResourcePlistFile("RuntimeScript", dir) ||
   !this->CopyResourcePlistFile("OSXX11.Info.plist", contDir,
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx 
b/Source/CPack/cmCPackPKGGenerator.cxx
index 19b587a..e5b96e3 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -225,8 +225,7 @@ void cmCPackPKGGenerator::CreateChoice(const 
cmCPackComponent& component,
   dirName += '/';
   dirName += component.Name;
   dirName += this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
-  unsigned long installedSize =
-component.GetInstalledSizeInKbytes(dirName.c_str());
+  unsigned long installedSize = component.GetInstalledSizeInKbytes(dirName);
 
   xout.StartElement("pkg-ref");
   xout.Attribute("id", packageId);
@@ -283,7 +282,7 @@ bool cmCPackPKGGenerator::CopyCreateResourceFile(const 
std::string& name,
 {
   std::string uname = cmSystemTools::UpperCase(name);
   std::string cpackVar =

[Cmake-commits] CMake branch, next, updated. v3.6.1-1474-g031a9c4

2016-08-26 Thread Gregor Jasny via Cmake-commits

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  031a9c4558879f4f5b5b4f5122623a78066e4638 (commit)
   via  4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd (commit)
   via  ff88df48e8a693f213a44aee3ad2474f500857b5 (commit)
  from  81bb94aff906c89cd7bc0cf070df1c34c0a4086b (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=031a9c4558879f4f5b5b4f5122623a78066e4638
commit 031a9c4558879f4f5b5b4f5122623a78066e4638
Merge: 81bb94a 4a5c14a
Author: Gregor Jasny 
AuthorDate: Fri Aug 26 02:54:03 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Aug 26 02:54:03 2016 -0400

Merge topic '16101-xcode-fix-directory-exclude-from-all' into next

4a5c14a5 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
ff88df48 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd
commit 4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd
Author: Gregor Jasny 
AuthorDate: Fri Aug 19 21:50:48 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Aug 26 08:53:39 2016 +0200

Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 780ca90..b4bc084 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2635,13 +2635,10 @@ void 
cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
 }
 
 bool cmGlobalXCodeGenerator::CreateGroups(
-  cmLocalGenerator* root, std::vector& generators)
+  std::vector& generators)
 {
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (this->IsExcluded(root, *i)) {
-  continue;
-}
 cmMakefile* mf = (*i)->GetMakefile();
 std::vector sourceGroups = mf->GetSourceGroups();
 std::vector tgts = (*i)->GetGeneratorTargets();
@@ -2873,7 +2870,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   this->MainGroupChildren->AddObject(resourcesGroup);
 
   // now create the cmake groups
-  if (!this->CreateGroups(root, generators)) {
+  if (!this->CreateGroups(generators)) {
 return false;
   }
 
@@ -3041,10 +3038,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   std::vector targets;
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (!this->IsExcluded(root, *i)) {
-  if (!this->CreateXCodeTargets(*i, targets)) {
-return false;
-  }
+if (!this->CreateXCodeTargets(*i, targets)) {
+  return false;
 }
   }
   // loop over all targets and add link and depend info
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 0485d4f..303dfa0 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -92,8 +92,7 @@ private:
   cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
  cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject* parent, std::string name);
-  bool CreateGroups(cmLocalGenerator* root,
-std::vector& generators);
+  bool CreateGroups(std::vector& generators);
   std::string XCodeEscapePath(const std::string& p);
   std::string RelativeToSource(const char* p);
   std::string RelativeToBinary(const char* p);
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
new file mode 100644
index 000..f686005
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
@@ -0,0 +1,6 @@
+enable_language(CXX)
+
+add_subdirectory(ExcludeFromAll EXCLUDE_FROM_ALL)
+
+add_executable(main main.cpp)
+target_link_libraries(main PRIVATE foo)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
new file mode 100644
index 000..b1df6b0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(bar STATIC bar.cpp)
+
+add_library(foo STATIC foo.cpp)
+target_include_directories(foo PUBLIC .)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
new file mode 100644
index 000..7a828bd
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
@@ -0,0 +1 @@

[Cmake-commits] CMake branch, next, updated. v3.6.1-1374-g91e3176

2016-08-23 Thread Gregor Jasny via Cmake-commits

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  91e3176521915a83fa1bbe3efbd03042a906bcc2 (commit)
   via  a0fbdb8b2c928306848dd19de0ceaf5a90c741a7 (commit)
  from  8007742a3a19ff7d9fded4ee7a8aeec8201dce1f (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=91e3176521915a83fa1bbe3efbd03042a906bcc2
commit 91e3176521915a83fa1bbe3efbd03042a906bcc2
Merge: 8007742 a0fbdb8
Author: Gregor Jasny 
AuthorDate: Tue Aug 23 15:12:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 23 15:12:21 2016 -0400

Merge topic '16101-xcode-fix-directory-exclude-from-all' into next

a0fbdb8b Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0fbdb8b2c928306848dd19de0ceaf5a90c741a7
commit a0fbdb8b2c928306848dd19de0ceaf5a90c741a7
Author: Gregor Jasny 
AuthorDate: Fri Aug 19 21:50:48 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Aug 20 22:27:09 2016 +0200

Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 780ca90..7b7c744 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,9 +2639,6 @@ bool cmGlobalXCodeGenerator::CreateGroups(
 {
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (this->IsExcluded(root, *i)) {
-  continue;
-}
 cmMakefile* mf = (*i)->GetMakefile();
 std::vector sourceGroups = mf->GetSourceGroups();
 std::vector tgts = (*i)->GetGeneratorTargets();
@@ -3041,10 +3038,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   std::vector targets;
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (!this->IsExcluded(root, *i)) {
-  if (!this->CreateXCodeTargets(*i, targets)) {
-return false;
-  }
+if (!this->CreateXCodeTargets(*i, targets)) {
+  return false;
 }
   }
   // loop over all targets and add link and depend info
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
new file mode 100644
index 000..f686005
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
@@ -0,0 +1,6 @@
+enable_language(CXX)
+
+add_subdirectory(ExcludeFromAll EXCLUDE_FROM_ALL)
+
+add_executable(main main.cpp)
+target_link_libraries(main PRIVATE foo)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
new file mode 100644
index 000..b1df6b0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(bar STATIC bar.cpp)
+
+add_library(foo STATIC foo.cpp)
+target_include_directories(foo PUBLIC .)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
new file mode 100644
index 000..7a828bd
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
@@ -0,0 +1 @@
+#error This should be excluded from all target
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
new file mode 100644
index 000..2789e61
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
@@ -0,0 +1,3 @@
+#include "foo.h"
+
+int foo() { return 42; }
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
new file mode 100644
index 000..5d5f8f0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
@@ -0,0 +1 @@
+int foo();
diff --git a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake 
b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
index 9d514e1..6d9418b 100644
--- a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
+++ b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
@@ -3,3 +3,15 @@ include(RunCMake)
 run_cmake(DoesNotExist)
 run_cmake(Missing)
 run_cmake(Function)
+
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExcludeFromAll)
+set(RunCMake_TEST_NO_CLEAN 1)
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+run_cmake(ExcludeFromAll)
+run_cmake_command(ExcludeFromAll-build ${CMAKE_COMMAND} --build .)
+
+unset(RunCMake_TEST_BINARY_DIR)

[Cmake-commits] CMake branch, next, updated. v3.6.1-1205-g8bbcf86

2016-08-09 Thread Gregor Jasny via Cmake-commits

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  8bbcf863e5d24a91a371ee9dec87381d6e09da9f (commit)
   via  93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583 (commit)
  from  c0566538859b568a58f23eabe12e49ff2370a140 (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=8bbcf863e5d24a91a371ee9dec87381d6e09da9f
commit 8bbcf863e5d24a91a371ee9dec87381d6e09da9f
Merge: c056653 93ac2a7
Author: Gregor Jasny 
AuthorDate: Tue Aug 9 15:25:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 15:25:55 2016 -0400

Merge topic '15687-xcode-support-system-include' into next

93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
commit 93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
Author: Gregor Jasny 
AuthorDate: Mon Aug 31 22:33:37 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Aug 9 20:30:07 2016 +0200

Xcode: Obey SYSTEM keyword for includes (#15687)

CMake used to put all header search paths into HEADER_SEARCH_PATHS
attribute. Unfortunately this attribute does not support to declare
a search path as a system include.

As a hack one could add a -isystem /path to the cflags but then include
ordering is not deterministic. A better approach was chosen with this
patch by not filling HEADER_SEARCH_PATHS at all and to populate
the C, C++, and Fortran flags directly. The include paths used by
Xcode should be now identical to the ones used by Unix Makefiles and
Ninja generator.

diff --git a/Modules/CMakeSwiftInformation.cmake 
b/Modules/CMakeSwiftInformation.cmake
index 61ad928..85d3143 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -13,6 +13,7 @@
 #  License text for the above reference.)
 
 set(CMAKE_Swift_OUTPUT_EXTENSION .o)
+set(CMAKE_INCLUDE_FLAG_Swift "-I")
 
 # Load compiler-specific information.
 if(CMAKE_Swift_COMPILER_ID)
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b396ea1..780ca90 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1907,23 +1907,40 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
   BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
- configName);
   std::set emitted;
   emitted.insert("/System/Library/Frameworks");
-  for (std::vector::iterator i = includes.begin();
-   i != includes.end(); ++i) {
-if (this->NameResolvesToFramework(i->c_str())) {
-  std::string frameworkDir = *i;
-  frameworkDir += "/../";
-  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
-  if (emitted.insert(frameworkDir).second) {
-fdirs.Add(this->XCodeEscapePath(frameworkDir));
+
+  if (this->XcodeVersion < 60) {
+std::vector includes;
+this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
+   configName);
+for (std::vector::iterator i = includes.begin();
+ i != includes.end(); ++i) {
+  if (this->NameResolvesToFramework(i->c_str())) {
+std::string frameworkDir = *i;
+frameworkDir += "/../";
+frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
+if (emitted.insert(frameworkDir).second) {
+  fdirs.Add(this->XCodeEscapePath(frameworkDir));
+}
+  } else {
+std::string incpath = this->XCodeEscapePath(*i);
+dirs.Add(incpath);
+  }
+}
+  } else {
+for (std::set::iterator li = languages.begin();
+ li != languages.end(); ++li) {
+  std::vector includes;
+  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li,
+ configName);
+  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
+includes, gtgt, *li, true, false, configName);
+
+  std::string& flags = cflags[*li];
+  if (!includeFlags.empty()) {
+flags += " " + includeFlags;
   }
-} else {
-  std::string incpath = this->XCodeEscapePath(*i);
-  dirs.Add(incpath);
 }
   }
   // Add framework search paths needed for linking.
@@ -2008,6 +2025,9 @@ void

[Cmake-commits] CMake branch, next, updated. v3.6.0-970-gfc0ef29

2016-07-22 Thread Gregor Jasny via Cmake-commits

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  fc0ef29399c7a03fc5ec11289826e9392a0bb803 (commit)
   via  f951d0adb4f7ca185804fba530a3dbc9b81f1cc5 (commit)
   via  c63380b1955422d7116f7ea90c238ab8619e9bc4 (commit)
   via  134d5c1f7c82698b79d88ba92a7bd98b81dceaec (commit)
   via  2b909c08f526536d4dd84dfe68edf22682ae88ca (commit)
   via  7bfbcc75a3158677897b2a80b02500425620e714 (commit)
  from  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (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=fc0ef29399c7a03fc5ec11289826e9392a0bb803
commit fc0ef29399c7a03fc5ec11289826e9392a0bb803
Merge: e4b2afd f951d0a
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 02:21:47 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:21:47 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

f951d0ad Add tests for BUNDLE_EXTENSION
c63380b1 Update documentation about bundle extensions
134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742)
2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
7bfbcc75 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
commit f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
Author: Gregor Jasny 
AuthorDate: Mon Jul 18 09:11:44 2016 -0700
Commit: Gregor Jasny 
CommitDate: Thu Jul 21 23:18:56 2016 -0700

Add tests for BUNDLE_EXTENSION

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b77d5d4..0684d57 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -31,13 +31,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesOSX-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=OFF")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=OFF"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -45,13 +48,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -61,13 +67,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7)
   set(RunCMake_TEST_BINARY_DIR 
${RunCMake_BINARY_DIR}/XcodeBundlesWatchOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_WATCHOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_WATCHOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -77,13 +86,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7.1)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesTvOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_TVOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_TVOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)

[Cmake-commits] CMake branch, next, updated. v3.6.0-964-ge4b2afd

2016-07-21 Thread Gregor Jasny via Cmake-commits

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  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (commit)
   via  ea6475334aff57633ad7bb80c013c8953328a909 (commit)
  from  d5be5b5f444f165229cfd699eed28fe25bff4342 (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=e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
commit e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
Merge: d5be5b5 ea64753
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 00:44:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 00:44:13 2016 -0400

Merge topic 'aliased-target-properties' into next

ea647533 Do not report ALIASED_TARGET as always set (#15783)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea6475334aff57633ad7bb80c013c8953328a909
commit ea6475334aff57633ad7bb80c013c8953328a909
Author: Gregor Jasny 
AuthorDate: Sat Jun 25 22:51:51 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jul 16 11:09:18 2016 -0700

Do not report ALIASED_TARGET as always set (#15783)

The cmGetPropertyCommand::StoreResult expects NULL for unset
properties. Make ALIASED_TARGET align with that expectation.

Additional corrections to the unit tests are necessary because
get_property removes variables for unset properties (in contrast
to get_target_property which stores a -NOTFOUND value).

diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 854fdb8..2307e08 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
   if (this->Makefile->IsAlias(this->Name)) {
 return this->StoreResult(target->GetName().c_str());
   } else {
-return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
+return this->StoreResult(NULL);
   }
 }
 return this->StoreResult(
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index 47ccbdc..552c83c 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -66,6 +66,11 @@ endif()
 add_library(iface INTERFACE)
 add_library(Alias::Iface ALIAS iface)
 
+get_property(_aliased_target_set TARGET foo PROPERTY ALIASED_TARGET SET)
+if(_aliased_target_set)
+  message(SEND_ERROR "ALIASED_TARGET is set for target foo")
+endif()
+
 get_target_property(_notAlias1 foo ALIASED_TARGET)
 if (NOT DEFINED _notAlias1)
   message(SEND_ERROR "_notAlias1 is not defined")
@@ -78,12 +83,6 @@ if (NOT _notAlias1 STREQUAL _notAlias1-NOTFOUND)
 endif()
 
 get_property(_notAlias2 TARGET foo PROPERTY ALIASED_TARGET)
-if (NOT DEFINED _notAlias2)
-  message(SEND_ERROR "_notAlias2 is not defined")
-endif()
 if (_notAlias2)
-  message(SEND_ERROR "_notAlias2 is defined, but foo is not an ALIAS")
-endif()
-if (NOT _notAlias2 STREQUAL _notAlias2-NOTFOUND)
-  message(SEND_ERROR "_notAlias2 not defined to a -NOTFOUND variant")
+  message(SEND_ERROR "_notAlias2 evaluates to true, but foo is not an ALIAS")
 endif()

---

Summary of changes:
 Source/cmGetPropertyCommand.cxx  |2 +-
 Tests/AliasTarget/CMakeLists.txt |   13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-539-g56b88e2

2016-06-26 Thread Gregor Jasny via Cmake-commits

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  56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714 (commit)
   via  2ca76a6651dd16586334067f6a41524a4015adc9 (commit)
   via  c68cf9e4d111fa7c92973acec92d71ce6d187ff9 (commit)
  from  76e61c487c40540d7a7bd58a4aaf375d4241b09a (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=56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714
commit 56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714
Merge: 76e61c4 2ca76a6
Author: Gregor Jasny 
AuthorDate: Sun Jun 26 16:18:43 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Jun 26 16:18:43 2016 -0400

Merge topic 'unknown-aliased-target' into next

2ca76a66 Validate target name in ALIASED_TARGET property getter
c68cf9e4 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ca76a6651dd16586334067f6a41524a4015adc9
commit 2ca76a6651dd16586334067f6a41524a4015adc9
Author: Gregor Jasny 
AuthorDate: Sun Jun 26 22:00:00 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Jun 26 22:00:00 2016 +0200

Validate target name in ALIASED_TARGET property getter

diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 06f7504..67b0e9d 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -248,15 +248,14 @@ bool cmGetPropertyCommand::HandleTargetMode()
 return false;
   }
 
-  if (this->PropertyName == "ALIASED_TARGET") {
-if (this->Makefile->IsAlias(this->Name)) {
-  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
+  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
+if (this->PropertyName == "ALIASED_TARGET") {
+  if (this->Makefile->IsAlias(this->Name)) {
 return this->StoreResult(target->GetName().c_str());
+  } else {
+return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
   }
 }
-return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
-  }
-  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
 return this->StoreResult(
   target->GetProperty(this->PropertyName, this->Makefile));
   } else {
diff --git a/Source/cmGetTargetPropertyCommand.cxx 
b/Source/cmGetTargetPropertyCommand.cxx
index dded9f7..073cf32 100644
--- a/Source/cmGetTargetPropertyCommand.cxx
+++ b/Source/cmGetTargetPropertyCommand.cxx
@@ -24,22 +24,18 @@ bool cmGetTargetPropertyCommand::InitialPass(
   std::string prop;
   bool prop_exists = false;
 
-  if (args[2] == "ALIASED_TARGET") {
-if (this->Makefile->IsAlias(targetName)) {
-  if (cmTarget* target = this->Makefile->FindTargetToUse(targetName)) {
-prop = target->GetName();
+  if (cmTarget* tgt = this->Makefile->FindTargetToUse(targetName)) {
+if (args[2] == "ALIASED_TARGET") {
+  if (this->Makefile->IsAlias(targetName)) {
+prop = tgt->GetName();
+prop_exists = true;
+  }
+} else if (!args[2].empty()) {
+  const char* prop_cstr = tgt->GetProperty(args[2], this->Makefile);
+  if (prop_cstr) {
+prop = prop_cstr;
 prop_exists = true;
   }
-}
-  } else if (cmTarget* tgt = this->Makefile->FindTargetToUse(targetName)) {
-cmTarget& target = *tgt;
-const char* prop_cstr = 0;
-if (!args[2].empty()) {
-  prop_cstr = target.GetProperty(args[2], this->Makefile);
-}
-if (prop_cstr) {
-  prop = prop_cstr;
-  prop_exists = true;
 }
   } else {
 bool issueMessage = false;

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGetPropertyCommand.cxx   |   11 +--
 Source/cmGetTargetPropertyCommand.cxx |   24 ++--
 3 files changed, 16 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-530-g2152e11

2016-06-24 Thread Gregor Jasny via Cmake-commits

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  2152e11e7a4f9d5bb80e224265e3aba40c92a060 (commit)
   via  e301be8c4f82aeab9a5693e611d93b22a901866e (commit)
   via  3b9d0962e79e8bdeec8a92684d62172197c1ae6d (commit)
   via  1721529fa69b60ec2717e85ef8730de549e226b1 (commit)
   via  f05657de9d1ae7247a527186830d37702ec30de4 (commit)
  from  41a51131f9a253459577cbe4562be5dd368a517d (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=2152e11e7a4f9d5bb80e224265e3aba40c92a060
commit 2152e11e7a4f9d5bb80e224265e3aba40c92a060
Merge: 41a5113 e301be8
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 17:26:16 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 24 17:26:16 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

e301be8c Update documentation about bundle extensions
3b9d0962 Honor BUNDLE_EXTENSION also for Frameworks (#14742)
1721529f Honor BUNDLE_EXTENSION also for App Bundles (#16148)
f05657de CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e301be8c4f82aeab9a5693e611d93b22a901866e
commit e301be8c4f82aeab9a5693e611d93b22a901866e
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 23:17:22 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:17:22 2016 +0200

Update documentation about bundle extensions

diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst 
b/Help/prop_tgt/BUNDLE_EXTENSION.rst
index ea265b3..6b3d580 100644
--- a/Help/prop_tgt/BUNDLE_EXTENSION.rst
+++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -1,7 +1,8 @@
 BUNDLE_EXTENSION
 
 
-The file extension used to name a :prop_tgt:`BUNDLE` target on the OS X and 
iOS.
+The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`,
+or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS.
 
-The default value is ``bundle`` - you can also use ``plugin`` or whatever
-file extension is required by the host app for your bundle.
+The default value is ``bundle``, ``framework``, or ``app`` for the respective
+target types.
diff --git a/Help/release/dev/app-framework-bundle-extension.rst 
b/Help/release/dev/app-framework-bundle-extension.rst
new file mode 100644
index 000..01855a2
--- /dev/null
+++ b/Help/release/dev/app-framework-bundle-extension.rst
@@ -0,0 +1,5 @@
+app-framework-bundle-extension
+--
+
+* On Apple platforms the :prop_tgt:`BUNDLE_EXTENSION` now also applies to
+  Frameworks and App Bundles.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b9d0962e79e8bdeec8a92684d62172197c1ae6d
commit 3b9d0962e79e8bdeec8a92684d62172197c1ae6d
Author: Gregor Jasny 
AuthorDate: Sun Jun 19 21:26:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:06:45 2016 +0200

Honor BUNDLE_EXTENSION also for Frameworks (#14742)

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4db1bd9..eec3422 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1396,7 +1396,12 @@ std::string 
cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
 {
   std::string fpath;
   fpath += this->GetOutputName(config, false);
-  fpath += ".framework";
+  fpath += ".";
+  const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+  if (!ext) {
+ext = "framework";
+  }
+  fpath += ext;
   if (!rootDir && !this->Makefile->PlatformIsAppleIos()) {
 fpath += "/Versions/";
 fpath += this->GetFrameworkVersion();
@@ -3013,7 +3018,13 @@ void cmGeneratorTarget::GetFullNameInternal(const 
std::string& config,
   std::string fw_prefix;
   if (this->IsFrameworkOnApple()) {
 fw_prefix = this->GetOutputName(config, false);
-fw_prefix += ".framework/";
+fw_prefix += ".";
+const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+if (!ext) {
+  ext = "framework";
+}
+fw_prefix += ext;
+fw_prefix += "/";
 targetPrefix = fw_prefix.c_str();
 targetSuffix = 0;
   }
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d27c579..91a90b2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1843,6 +1843,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 std::string fw_version = gtgt->GetFrameworkVersion();
 buildSettings->AddAttribute("FRAMEWORK_VERSION",
 this->CreateString(fw_version));
+const char* ext =

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-410-gbb9d46a

2016-06-18 Thread Gregor Jasny via Cmake-commits

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  bb9d46a0c05ba8ee02686eb2bb6b54653154efac (commit)
   via  e36e5a2680f34c64773944b152e5337f8951a644 (commit)
  from  c4b7479bd0583670302562c9d1841fa13b3c8fea (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=bb9d46a0c05ba8ee02686eb2bb6b54653154efac
commit bb9d46a0c05ba8ee02686eb2bb6b54653154efac
Merge: c4b7479 e36e5a2
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 17:23:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jun 18 17:23:56 2016 -0400

Merge topic 'xcode-bundle-extension' into next

e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36e5a2680f34c64773944b152e5337f8951a644
commit e36e5a2680f34c64773944b152e5337f8951a644
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 22:59:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jun 18 23:23:32 2016 +0200

Xcode: Properly handle BUNDLE_EXTENSION

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d30830a..e82cb16 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1801,6 +1801,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   extraLinkOptions += " ";
   extraLinkOptions += createFlags;
 }
+const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+if (ext) {
+  buildSettings->AddAttribute("WRAPPER_EXTENSION",
+  this->CreateString(ext));
+}
 std::string plist = this->ComputeInfoPListLocation(gtgt);
 // Xcode will create the final version of Info.plist at build time,
 // so let it replace the cfbundle name. This avoids creating
diff --git a/Tests/CFBundleTest/CMakeLists.txt 
b/Tests/CFBundleTest/CMakeLists.txt
index 5cda527..0fe6bb7 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -50,7 +50,6 @@ set_source_files_properties(
 set_target_properties(CFBundleTest PROPERTIES
 BUNDLE 1
 BUNDLE_EXTENSION plugin
-XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin  #sets the extension to .plugin
 XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
 XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
 MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |5 +
 Tests/CFBundleTest/CMakeLists.txt |1 -
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-291-g5ec42ea

2016-06-13 Thread Gregor Jasny via Cmake-commits

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  5ec42eaf96b0088cd5b3e989e7458b73b65e5951 (commit)
   via  b3ba006100b776351c62d8e2b53beadff771bf13 (commit)
   via  1dffee9afe54314b9522f8cfcf72bb48baad6fbc (commit)
   via  8d4ed32eff88dfb708a3e403641c28eedd42 (commit)
   via  91a77cfaa78364affc99562cfdc357a70f972ca9 (commit)
   via  2a942b6eab0521bd22e8841a52b3c7f22d069059 (commit)
  from  f6355822b1bb2874cf6130dbd0f8bd10654bb9d3 (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=5ec42eaf96b0088cd5b3e989e7458b73b65e5951
commit 5ec42eaf96b0088cd5b3e989e7458b73b65e5951
Merge: f635582 b3ba006
Author: Gregor Jasny 
AuthorDate: Mon Jun 13 12:22:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Jun 13 12:22:04 2016 -0400

Merge topic 'xcode-mig-support' into next

b3ba0061 Xcode: Add support for mig files
1dffee9a Xcode: Add XCODE_FILE_ATTRIBUTES source file property
8d4ed32e Xcode: Don't emit empty settings blocks.
91a77cfa Xcode: Add function to conditionally add Xcode Attributes
2a942b6e Xcode: Add const qualifiers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3ba006100b776351c62d8e2b53beadff771bf13
commit b3ba006100b776351c62d8e2b53beadff771bf13
Author: James Touton 
AuthorDate: Fri Jun 3 18:27:39 2016 -0700
Commit: Gregor Jasny 
CommitDate: Sun Jun 12 22:20:22 2016 +0200

Xcode: Add support for mig files

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 8eefb19..d30830a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,6 +787,8 @@ std::string GetSourcecodeValueFromFileExtension(const 
std::string& _ext,
 sourcecode += ".asm";
   } else if (ext == "metal") {
 sourcecode += ".metal";
+  } else if (ext == "mig") {
+sourcecode += ".mig";
   }
   // else
   //  {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dffee9afe54314b9522f8cfcf72bb48baad6fbc
commit 1dffee9afe54314b9522f8cfcf72bb48baad6fbc
Author: James Touton 
AuthorDate: Fri Jun 3 18:51:18 2016 -0700
Commit: Gregor Jasny 
CommitDate: Sun Jun 12 22:20:22 2016 +0200

Xcode: Add XCODE_FILE_ATTRIBUTES source file property

This adds values to the ATTRIBUTES list in PBXBuildFile settings.

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 3403dcd..1c64d63 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -344,6 +344,7 @@ Properties on Source Files
/prop_sf/VS_XAML_TYPE
/prop_sf/WRAP_EXCLUDE
/prop_sf/XCODE_EXPLICIT_FILE_TYPE
+   /prop_sf/XCODE_FILE_ATTRIBUTES
/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE
 
 .. _`Cache Entry Properties`:
diff --git a/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst 
b/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst
new file mode 100644
index 000..39e6966
--- /dev/null
+++ b/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst
@@ -0,0 +1,11 @@
+XCODE_FILE_ATTRIBUTES
+-
+
+Add values to the Xcode ``ATTRIBUTES`` setting on its reference to a
+source file.  Among other things, this can be used to set the role on
+a mig file::
+
+  set_source_files_properties(defs.mig
+  PROPERTIES
+  XCODE_FILE_ATTRIBUTES "Client;Server"
+  )
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b439018..8eefb19 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -714,6 +714,20 @@ cmXCodeObject* 
cmGlobalXCodeGenerator::CreateXCodeSourceFile(
 }
   }
 
+  // Add user-specified file attributes.
+  const char* extraFileAttributes = sf->GetProperty("XCODE_FILE_ATTRIBUTES");
+  if (extraFileAttributes) {
+// Expand the list of attributes.
+std::vector attributes;
+cmSystemTools::ExpandListArgument(extraFileAttributes, attributes);
+
+// Store the attributes.
+for (std::vector::const_iterator ai = attributes.begin();
+ ai != attributes.end(); ++ai) {
+  attrs->AddObject(this->CreateString(*ai));
+}
+  }
+
   settings->AddAttributeIfNotEmpty("ATTRIBUTES", attrs);
 
   // Add the fileRef to the top level Resources group/folder if it is not

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d4ed32eff88dfb708a3e403641c28eedd42
commit 8d4ed32eff88dfb708a3e403641c28eedd42
Author: James Touton 
AuthorDate: Fri Jun 3 18:32:38 2016 -0700
Commit: Gregor Jasny

[Cmake-commits] CMake branch, next, updated. v3.5.2-1110-g3483677

2016-04-27 Thread Gregor Jasny via Cmake-commits

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  3483677c2681eb5627e7bfdffdaa0e3402fd2cca (commit)
   via  2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28 (commit)
  from  b3f751575385969e808fdaf45de09958822d5b1a (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=3483677c2681eb5627e7bfdffdaa0e3402fd2cca
commit 3483677c2681eb5627e7bfdffdaa0e3402fd2cca
Merge: b3f7515 2d7d33e
Author: Gregor Jasny 
AuthorDate: Wed Apr 27 16:40:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Apr 27 16:40:04 2016 -0400

Merge topic 'hyperlink-documentation' into next

2d7d33ec Help: Hyperlink properties


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28
commit 2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28
Author: Gregor Jasny 
AuthorDate: Wed Apr 27 22:38:59 2016 +0200
Commit: Gregor Jasny 
CommitDate: Wed Apr 27 22:38:59 2016 +0200

Help: Hyperlink properties

diff --git a/Help/prop_dir/LISTFILE_STACK.rst b/Help/prop_dir/LISTFILE_STACK.rst
index f729c1e..22ec4b6 100644
--- a/Help/prop_dir/LISTFILE_STACK.rst
+++ b/Help/prop_dir/LISTFILE_STACK.rst
@@ -5,5 +5,6 @@ The current stack of listfiles being processed.
 
 This property is mainly useful when trying to debug errors in your
 CMake scripts.  It returns a list of what list files are currently
-being processed, in order.  So if one listfile does an INCLUDE command
-then that is effectively pushing the included listfile onto the stack.
+being processed, in order.  So if one listfile does an
+:command:`include` command then that is effectively pushing the
+included listfile onto the stack.
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
index 185246c..e52f8eb 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
@@ -1,9 +1,10 @@
 FIND_LIBRARY_USE_LIB64_PATHS
 
 
-Whether FIND_LIBRARY should automatically search lib64 directories.
+Whether :command:`find_library` should automatically search lib64
+directories.
 
 FIND_LIBRARY_USE_LIB64_PATHS is a boolean specifying whether the
-FIND_LIBRARY command should automatically search the lib64 variant of
-directories called lib in the search path when building 64-bit
-binaries.
+:command:`find_library` command should automatically search the lib64
+variant of directories called lib in the search path when building
+64-bit binaries.
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
index 9a3edd8..beb94ac 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
@@ -1,9 +1,10 @@
 FIND_LIBRARY_USE_OPENBSD_VERSIONING
 ---
 
-Whether FIND_LIBRARY should find OpenBSD-style shared libraries.
+Whether :command:`find_library` should find OpenBSD-style shared
+libraries.
 
-This property is a boolean specifying whether the FIND_LIBRARY command
-should find shared libraries with OpenBSD-style versioned extension:
-".so..".  The property is set to true on OpenBSD and
-false on other platforms.
+This property is a boolean specifying whether the
+:command:`find_library` command should find shared libraries with
+OpenBSD-style versioned extension: ".so..".  The
+property is set to true on OpenBSD and false on other platforms.
diff --git a/Help/prop_gbl/IN_TRY_COMPILE.rst b/Help/prop_gbl/IN_TRY_COMPILE.rst
index 3a2ef5b..fd2d2e1 100644
--- a/Help/prop_gbl/IN_TRY_COMPILE.rst
+++ b/Help/prop_gbl/IN_TRY_COMPILE.rst
@@ -3,4 +3,5 @@ IN_TRY_COMPILE
 
 Read-only property that is true during a try-compile configuration.
 
-True when building a project inside a TRY_COMPILE or TRY_RUN command.
+True when building a project inside a :command:`try_compile` or
+:command:`try_run` command.
diff --git a/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst 
b/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
index e85b823..bf8c9a3 100644
--- a/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
+++ b/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
@@ -5,5 +5,5 @@ Name of FOLDER for targets that are added automatically by 
CMake.
 
 If not set, CMake uses "CMakePredefinedTargets" as a default value for
 this property.  Targets such as INSTALL, PACKAGE and RUN_TESTS will be
-organized into this FOLDER.  See also the documentation for the FOLDER
-target property.
+organized into this FOLDER.  See also the

[Cmake-commits] CMake branch, next, updated. v3.5.1-671-g2d932b4

2016-03-28 Thread Gregor Jasny via Cmake-commits

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  2d932b45dc63e8fb0f43fdcb9f69a6d020e553da (commit)
   via  ed8979540f1f0549bb7ab5432a1a35e46790ba76 (commit)
  from  0f364a2b1b134ce79fe62093f959d0d79657a96c (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=2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
commit 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
Merge: 0f364a2 ed89795
Author: Gregor Jasny 
AuthorDate: Mon Mar 28 16:35:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Mar 28 16:35:33 2016 -0400

Merge topic 'asm-includes' into next

ed897954 Add missing  placeholder for ASM languages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed8979540f1f0549bb7ab5432a1a35e46790ba76
commit ed8979540f1f0549bb7ab5432a1a35e46790ba76
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 23:18:07 2016 +0100
Commit: Gregor Jasny 
CommitDate: Fri Mar 25 23:18:07 2016 +0100

Add missing  placeholder for ASM languages

Signed-off-by: Gregor Jasny 

diff --git a/Modules/CMakeASM-ATTInformation.cmake 
b/Modules/CMakeASM-ATTInformation.cmake
index 675c13b..07a2d38 100644
--- a/Modules/CMakeASM-ATTInformation.cmake
+++ b/Modules/CMakeASM-ATTInformation.cmake
@@ -19,7 +19,7 @@ set(ASM_DIALECT "-ATT")
 # assembler but should be processed by gcc
 set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;asm)
 
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
 -o  ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
  -o  ")
 
 include(CMakeASMInformation)
 set(ASM_DIALECT)
diff --git a/Modules/CMakeASM_NASMInformation.cmake 
b/Modules/CMakeASM_NASMInformation.cmake
index 7058fc7..146f412 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -38,7 +38,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
   endif()
 endif()
 
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "  -f 
${CMAKE_ASM_NASM_OBJECT_FORMAT} -o  ")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "  
 -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o  ")
 
 # Load the generic ASMInformation file:
 set(ASM_DIALECT "_NASM")
diff --git a/Modules/Compiler/ARMCC-ASM.cmake b/Modules/Compiler/ARMCC-ASM.cmake
index 8e3cfc5..539d525 100644
--- a/Modules/Compiler/ARMCC-ASM.cmake
+++ b/Modules/Compiler/ARMCC-ASM.cmake
@@ -3,5 +3,5 @@ include(Compiler/ARMCC)
 set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
 set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
 
-set(CMAKE_ASM_COMPILE_OBJECT   "  -o  
")
+set(CMAKE_ASM_COMPILE_OBJECT   "   -o 
 ")
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
diff --git a/Modules/Platform/Generic-ADSP-ASM.cmake 
b/Modules/Platform/Generic-ADSP-ASM.cmake
index 63a1388..e718bec 100644
--- a/Modules/Platform/Generic-ADSP-ASM.cmake
+++ b/Modules/Platform/Generic-ADSP-ASM.cmake
@@ -3,5 +3,5 @@ include(Platform/Generic-ADSP-Common)
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
 set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" )
 set(CMAKE_ASM_COMPILE_OBJECT
-"  -proc ${ADSP_PROCESSOR} -si-revision 
${ADSP_PROCESSOR_SILICIUM_REVISION} -o  ")
+"   -proc ${ADSP_PROCESSOR} 
-si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o  ")
 
diff --git a/Modules/Platform/gas.cmake b/Modules/Platform/gas.cmake
index 7d2bc84..7c659f2 100644
--- a/Modules/Platform/gas.cmake
+++ b/Modules/Platform/gas.cmake
@@ -4,7 +4,7 @@ else()
   set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
 endif()
 
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
 -o  ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
  -o  ")
 
 set(CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY
   " cr"

---

Summary of changes:
 Modules/CMakeASM-ATTInformation.cmake   |2 +-
 Modules/CMakeASM_NASMInformation.cmake  |2 +-
 Modules/Compiler/ARMCC-ASM.cmake|2 +-
 Modules/Platform/Generic-ADSP-ASM.cmake |2 +-
 Modules/Platform/gas.cmake  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-657-g021e01c

2016-03-25 Thread Gregor Jasny via Cmake-commits

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  021e01c423475f7c358a50775e0fc4073be8e75c (commit)
   via  62473f5689e6b03ec92b266b5feb822aec2b88dc (commit)
  from  7d8ab1b2b2ee7cc15940cf6e97ba034d91bbb074 (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=021e01c423475f7c358a50775e0fc4073be8e75c
commit 021e01c423475f7c358a50775e0fc4073be8e75c
Merge: 7d8ab1b 62473f5
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 17:35:18 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Mar 25 17:35:18 2016 -0400

Merge topic 'xcode73-xctest-location' into next

62473f56 Xcode: Fixup XCTest bundle location for Xcode 7.3


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62473f5689e6b03ec92b266b5feb822aec2b88dc
commit 62473f5689e6b03ec92b266b5feb822aec2b88dc
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 22:20:14 2016 +0100
Commit: Gregor Jasny 
CommitDate: Fri Mar 25 22:20:14 2016 +0100

Xcode: Fixup XCTest bundle location for Xcode 7.3

Prior to Xcode 7.3 a XCTest bundle was built like an ordinary
bundle. But starting with Xcode 7.3 it is implicitely built as
a plugin for the test host. It looks like in that case the
'Build Products Path' is ignored.

This patch simply sets the CMake target output path to the value
Xcode expects internally to get a matching view of both.

The command:

  xcodebuild -showBuildSettings -target CocoaExampleTests -configuration 
Debug

Output with Xcode 7.2:

  TARGET_BUILD_DIR = .../Tests/XCTest/Debug

Output with Xcode 7.3

  TARGET_BUILD_DIR = 
.../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns

Signed-off-by: Gregor Jasny 

diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake
index 3cd9c22..805a58c 100644
--- a/Modules/FindXCTest.cmake
+++ b/Modules/FindXCTest.cmake
@@ -140,6 +140,10 @@ function(xctest_add_bundle target testee)
   set_target_properties(${target} PROPERTIES
 XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
 XCODE_ATTRIBUTE_TEST_HOST "$")
+  if(NOT XCODE_VERSION VERSION_LESS 7.3)
+set_target_properties(${target} PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY "$/../PlugIns")
+  endif()
 else(XCODE)
   target_link_libraries(${target}
 PRIVATE -bundle_loader $)

---

Summary of changes:
 Modules/FindXCTest.cmake |4 
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.0-409-g49cff25

2016-03-09 Thread Gregor Jasny via Cmake-commits

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  49cff25ca3e667d6d5a20a6b64ed55ef875890c1 (commit)
   via  111cd679191c8aa4e081765ac4f7bc2e08657c7f (commit)
  from  96f661517d1e98a7a940f16781e6713745074e2a (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=49cff25ca3e667d6d5a20a6b64ed55ef875890c1
commit 49cff25ca3e667d6d5a20a6b64ed55ef875890c1
Merge: 96f6615 111cd67
Author: Gregor Jasny 
AuthorDate: Wed Mar 9 14:33:43 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 14:33:43 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

111cd679 Xcode: ReRunCMake even if files disappeared (#15992)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=111cd679191c8aa4e081765ac4f7bc2e08657c7f
commit 111cd679191c8aa4e081765ac4f7bc2e08657c7f
Author: Gregor Jasny 
AuthorDate: Sun Mar 6 17:46:53 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Mar 9 20:33:01 2016 +0100

Xcode: ReRunCMake even if files disappeared (#15992)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index ef18729..7c85281 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -593,19 +593,28 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   cmGeneratedFileStream makefileStream
 (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
-  makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetBinaryDirectory();
-  checkCache += "/";
-  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
-  checkCache += "cmake.check_cache";
-  makefileStream << this->ConvertToRelativeForMake(checkCache.c_str())
- << ": ";
+  makefileStream << "# Generated by CMake, DO NOT EDIT\n\n";
+
+  makefileStream << "empty:= \n";
+  makefileStream << "space:= $(empty) $(empty)\n";
+  makefileStream << "spaceplus:= $(empty)\\ $(empty)\n\n";
+
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
+makefileStream << "TARGETS += $(subst $(space),$(spaceplus),$(wildcard "
+   << this->ConvertToRelativeForMake(i->c_str())
+   << "))\n";
 }
-  makefileStream << "\n\t" <<
+
+  std::string checkCache = root->GetBinaryDirectory();
+  checkCache += "/";
+  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
+  checkCache += "cmake.check_cache";
+
+  makefileStream << "\n" << this->ConvertToRelativeForMake(checkCache.c_str())
+ << ": $(TARGETS)\n";
+  makefileStream << "\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
  << " -H" << this->ConvertToRelativeForMake(
root->GetSourceDirectory())
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake 
b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 31c72fb..51e0b0a 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -40,3 +40,42 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode")
 endif()
 
 run_BuildDepends(Custom-Always)
+
+function(run_ReGeneration)
+  # test re-generation of project even if CMakeLists.txt files disappeared
+
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/regenerate-project-build)
+  set(RunCMake_TEST_SOURCE_DIR 
${RunCMake_BINARY_DIR}/regenerate-project-source)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  set(ProjectHeader [=[
+cmake_minimum_required(VERSION 3.5)
+project(Regenerate-Project NONE)
+  ]=])
+
+  # create project with subdirectory
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
+"add_subdirectory(mysubdir)")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
+
+  run_cmake(Regenerate-Project)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay})
+
+  # now we delete the subdirectory and adjust the CMakeLists.txt
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
+
+  run_cmake_command(Regenerate-Project-Directory-Removed
+${CMAKE_COMMAND} --build

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-307-g67e7b48

2016-02-29 Thread Gregor Jasny via Cmake-commits

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  67e7b4843d0df72f6b50278970352c42852ead17 (commit)
   via  b59d4aa65317e1c2292bd70d85e2de65fe773dec (commit)
  from  5be433e1cad0265f8e972c7a18f3f489878657fe (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=67e7b4843d0df72f6b50278970352c42852ead17
commit 67e7b4843d0df72f6b50278970352c42852ead17
Merge: 5be433e b59d4aa
Author: Gregor Jasny 
AuthorDate: Mon Feb 29 03:30:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 29 03:30:27 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

b59d4aa6 Revert "Xcode: ReRunCMake even if files disappeared (#15992)"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59d4aa65317e1c2292bd70d85e2de65fe773dec
commit b59d4aa65317e1c2292bd70d85e2de65fe773dec
Author: Gregor Jasny 
AuthorDate: Mon Feb 29 09:29:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Feb 29 09:29:50 2016 +0100

Revert "Xcode: ReRunCMake even if files disappeared (#15992)"

Whitespace handling in paths is broken.

This reverts commit aa4b5ea60018e38683fc8960c2e3534845c44a02.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 7844611..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -603,8 +603,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << "$(wildcard "
-   << this->ConvertToRelativeForMake(i->c_str()) << ")";
+makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
 }
   makefileStream << "\n\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 274e13e..a07bbbe 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -298,37 +298,3 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY 
\"${RunCMake_TEST_BINARY_DIR}\")
 )
 endfunction()
 run_cmake_depends()
-
-# test re-generation of project even if CMakeLists.txt files disappeared
-if(UNIX)
-  # Use a single build tree for a few tests without cleaning.
-  set(RunCMake_TEST_BINARY_DIR
-${RunCMake_BINARY_DIR}/regenerate-project-build)
-  set(RunCMake_TEST_SOURCE_DIR
-${RunCMake_BINARY_DIR}/regenerate-project-source)
-  set(RunCMake_TEST_NO_CLEAN 1)
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
-  set(ProjectHeader [=[
-cmake_minimum_required(VERSION 3.5)
-project(regenerate-project NONE)
-  ]=])
-
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
-"add_subdirectory(mysubdir)")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
-
-  run_cmake(regenerate-project-create)
-
-  # now we delete the subdirectory and adjust the CMakeLists.txt
-  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
-
-  run_cmake_command(regenerate-project-should-work
-${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
-
-  unset(RunCMake_TEST_BINARY_DIR)
-  unset(RunCMake_TEST_SOURCE_DIR)
-  unset(RunCMake_TEST_NO_CLEAN)
-endif()

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |3 +--
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |   34 -
 2 files changed, 1 insertion(+), 36 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-305-g5be433e

2016-02-28 Thread Gregor Jasny via Cmake-commits

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  5be433e1cad0265f8e972c7a18f3f489878657fe (commit)
   via  aa4b5ea60018e38683fc8960c2e3534845c44a02 (commit)
   via  b500c98c91ce1ca90d152daab81b5761a6c480ee (commit)
   via  499be36a64e186a7426aae5ee4613b07a722827a (commit)
  from  d7b1a40b0f039ed46522d5c9f3c7c421833ba32c (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=5be433e1cad0265f8e972c7a18f3f489878657fe
commit 5be433e1cad0265f8e972c7a18f3f489878657fe
Merge: d7b1a40 aa4b5ea
Author: Gregor Jasny 
AuthorDate: Sun Feb 28 11:35:53 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 28 11:35:53 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

aa4b5ea6 Xcode: ReRunCMake even if files disappeared (#15992)
b500c98c CMake Nightly Date Stamp
499be36a CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa4b5ea60018e38683fc8960c2e3534845c44a02
commit aa4b5ea60018e38683fc8960c2e3534845c44a02
Author: Gregor Jasny 
AuthorDate: Sun Feb 28 17:27:17 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Feb 28 17:35:15 2016 +0100

Xcode: ReRunCMake even if files disappeared (#15992)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index ef18729..7844611 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -603,7 +603,8 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
+makefileStream << "\\\n" << "$(wildcard "
+   << this->ConvertToRelativeForMake(i->c_str()) << ")";
 }
   makefileStream << "\n\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index a07bbbe..274e13e 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -298,3 +298,37 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY 
\"${RunCMake_TEST_BINARY_DIR}\")
 )
 endfunction()
 run_cmake_depends()
+
+# test re-generation of project even if CMakeLists.txt files disappeared
+if(UNIX)
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR
+${RunCMake_BINARY_DIR}/regenerate-project-build)
+  set(RunCMake_TEST_SOURCE_DIR
+${RunCMake_BINARY_DIR}/regenerate-project-source)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  set(ProjectHeader [=[
+cmake_minimum_required(VERSION 3.5)
+project(regenerate-project NONE)
+  ]=])
+
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
+"add_subdirectory(mysubdir)")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
+
+  run_cmake(regenerate-project-create)
+
+  # now we delete the subdirectory and adjust the CMakeLists.txt
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
+
+  run_cmake_command(regenerate-project-should-work
+${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_SOURCE_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+endif()

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGlobalXCodeGenerator.cxx |3 ++-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |   34 +
 3 files changed, 37 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-239-gcf1a414

2016-02-21 Thread Gregor Jasny via Cmake-commits

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  cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (commit)
   via  c50fefc0ff7680922390879cbdb4fbb9b9c88a7d (commit)
  from  634c78061295a4633b7cdd651cbf6eed98642c84 (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=cf1a414cfb2917588a6eff20cc8cdda4c98264d9
commit cf1a414cfb2917588a6eff20cc8cdda4c98264d9
Merge: 634c780 c50fefc
Author: Gregor Jasny 
AuthorDate: Sun Feb 21 12:54:52 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 21 12:54:52 2016 -0500

Merge topic 'xcode-refactor-xcodeobject' into next

c50fefc0 Refactor XCode block writes to allow any number of nesting.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50fefc0ff7680922390879cbdb4fbb9b9c88a7d
commit c50fefc0ff7680922390879cbdb4fbb9b9c88a7d
Author: Robert Goulet 
AuthorDate: Fri Feb 19 14:00:19 2016 -0500
Commit: Gregor Jasny 
CommitDate: Sun Feb 21 17:13:26 2016 +0100

Refactor XCode block writes to allow any number of nesting.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 5bc34c1..911e154 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -111,102 +111,102 @@ void cmXCodeObject::Print(std::ostream& out)
   for(i = this->ObjectAttributes.begin();
   i != this->ObjectAttributes.end(); ++i)
 {
-cmXCodeObject* object = i->second;
-if(i->first != "isa")
-  {
-  cmXCodeObject::Indent(3*indentFactor, out);
-  }
-else
-  {
+if(i->first == "isa")
   continue;
-  }
-if(object->TypeValue == OBJECT_LIST)
-  {
-  out << i->first << " = (" << separator;
-  for(unsigned int k = 0; k < i->second->List.size(); k++)
-{
-cmXCodeObject::Indent(4*indentFactor, out);
-out << i->second->List[k]->Id;
-i->second->List[k]->PrintComment(out);
-out << "," << separator;
-}
-  cmXCodeObject::Indent(3*indentFactor, out);
-  out << ");" << separator;
-  }
-else if(object->TypeValue == ATTRIBUTE_GROUP)
+
+PrintAttribute(out, 3, separator, indentFactor, i->first, i->second, this);
+}
+  cmXCodeObject::Indent(2*indentFactor, out);
+  out << "};\n";
+}
+
+void cmXCodeObject::PrintAttribute(std::ostream& out, const int level,
+   const std::string separator,
+   const int factor, const std::string& name,
+   const cmXCodeObject* object,
+   const cmXCodeObject* parent)
+{
+  cmXCodeObject::Indent(level * factor, out);
+  switch(object->TypeValue)
+{
+case OBJECT_LIST:
   {
-  std::map::iterator j;
-  out << i->first << " = {";
-  if(separator == "\n")
+  out << name << " = (";
+  if(parent->TypeValue != ATTRIBUTE_GROUP)
 {
 out << separator;
 }
-  for(j = object->ObjectAttributes.begin(); j !=
-object->ObjectAttributes.end(); ++j)
+  for(unsigned int i = 0; i < object->List.size(); ++i)
 {
-cmXCodeObject::Indent(4 *indentFactor, out);
-
-if(j->second->TypeValue == STRING)
-  {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = ";
-  j->second->PrintString(out);
-  out << ";";
-  }
-else if(j->second->TypeValue == OBJECT_LIST)
+if(object->List[i]->TypeValue == STRING)
   {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = (";
-  for(unsigned int k = 0; k < j->second->List.size(); k++)
+  object->List[i]->PrintString(out);
+  if(i+1 < object->List.size())
 {
-if(j->second->List[k]->TypeValue == STRING)
-  {
-  j->second->List[k]->PrintString(out);
-  out << ", ";
-  }
-else
-  {
-  out << "List_" << k << "_TypeValue_IS_NOT_STRING, ";
-  }
+out << ",";
 }
-  out << ");";
   }
 else
   {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = error_unexpected_TypeValue_" <<
-j->second->TypeValue << ";";
+  cmXCodeObject::Indent((level + 1) * factor, out);
+  out << object->List[i]->Id;
+  object->List[i]->PrintComment(out);
+  out << "," << separator;
   }
+}
+  if(parent->TypeValue !=

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-237-g634c780

2016-02-21 Thread Gregor Jasny via Cmake-commits

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  634c78061295a4633b7cdd651cbf6eed98642c84 (commit)
   via  c3c9374cd4128b309ca84d4c1629d7c43bbc94ee (commit)
   via  7e32bd945a9f32144ac63fdcd085197658229f9c (commit)
   via  6872a4fde02de182cdec6786d4630387dd22fddf (commit)
  from  9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (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=634c78061295a4633b7cdd651cbf6eed98642c84
commit 634c78061295a4633b7cdd651cbf6eed98642c84
Merge: 9f72e3d c3c9374
Author: Gregor Jasny 
AuthorDate: Sun Feb 21 10:47:45 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 21 10:47:45 2016 -0500

Merge topic 'xcode-remove-reftype' into next

c3c9374c Write refType only for Xcode 1.5
7e32bd94 CMake Nightly Date Stamp
6872a4fd CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
commit c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
Author: Gregor Jasny 
AuthorDate: Mon Feb 8 19:39:05 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Feb 21 16:44:30 2016 +0100

Write refType only for Xcode 1.5

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 526e32f..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2805,7 +2805,10 @@ 
cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
 fullName = gtgt->GetFullName(defConfig.c_str());
 }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
-  fileRef->AddAttribute("refType", this->CreateString("0"));
+  if(this->XcodeVersion == 15)
+{
+fileRef->AddAttribute("refType", this->CreateString("0"));
+}
   fileRef->AddAttribute("sourceTree",
 this->CreateString("BUILT_PRODUCTS_DIR"));
   fileRef->SetComment(gtgt->GetName().c_str());

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGlobalXCodeGenerator.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-55-g830e87e

2016-02-08 Thread Gregor Jasny via Cmake-commits

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  830e87e4076bcd7a5bacda7ccd823b5050a77879 (commit)
   via  5b04aa31b8d791bc5e162fbc8c89b2d0058c8572 (commit)
  from  c4e3666047f50c16673ab70c66b57046995052b5 (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=830e87e4076bcd7a5bacda7ccd823b5050a77879
commit 830e87e4076bcd7a5bacda7ccd823b5050a77879
Merge: c4e3666 5b04aa3
Author: Gregor Jasny 
AuthorDate: Mon Feb 8 06:49:58 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 8 06:49:58 2016 -0500

Merge topic 'apple-isystem-gcc' into next

5b04aa31 Xcode: Disable test for system include dirs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b04aa31b8d791bc5e162fbc8c89b2d0058c8572
commit 5b04aa31b8d791bc5e162fbc8c89b2d0058c8572
Author: Gregor Jasny 
AuthorDate: Mon Feb 8 12:48:35 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Feb 8 12:48:35 2016 +0100

Xcode: Disable test for system include dirs

diff --git a/Tests/Complex/Executable/CMakeLists.txt 
b/Tests/Complex/Executable/CMakeLists.txt
index a1f8e68..c30dcbc 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -146,7 +146,8 @@ add_dependencies(notInAllCustom notInAllExe)
 #
 add_subdirectory(Temp)
 
-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
+if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX
+   AND NOT XCODE) # XCODE is excluded due to #15687
   add_executable(testSystemDir testSystemDir.cxx)
   set_target_properties(testSystemDir PROPERTIES COMPILE_FLAGS "-Werror")
 endif()
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt 
b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index b2307b2..4897b48 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
@@ -146,7 +146,8 @@ add_dependencies(notInAllCustom notInAllExe)
 #
 add_subdirectory(Temp)
 
-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
+if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX
+   AND NOT XCODE) # XCODE is excluded due to #15687
   add_executable(testSystemDir testSystemDir.cxx)
   set_target_properties(testSystemDir PROPERTIES COMPILE_FLAGS "-Werror")
 endif()

---

Summary of changes:
 Tests/Complex/Executable/CMakeLists.txt  |3 ++-
 Tests/ComplexOneConfig/Executable/CMakeLists.txt |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-53-gc4e3666

2016-02-07 Thread Gregor Jasny via Cmake-commits

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  c4e3666047f50c16673ab70c66b57046995052b5 (commit)
   via  2cae5128fdc6316a7f0913cb89ec467b33b9715b (commit)
   via  c8100794b4faab4255c1229f966f57525c18ccc7 (commit)
   via  d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db (commit)
  from  b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 (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=c4e3666047f50c16673ab70c66b57046995052b5
commit c4e3666047f50c16673ab70c66b57046995052b5
Merge: b11b9d0 2cae512
Author: Gregor Jasny 
AuthorDate: Sun Feb 7 14:42:32 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 7 14:42:32 2016 -0500

Merge topic 'apple-isystem-gcc' into next

2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953)
c8100794 CMake Nightly Date Stamp
d276b6e9 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cae5128fdc6316a7f0913cb89ec467b33b9715b
commit 2cae5128fdc6316a7f0913cb89ec467b33b9715b
Author: Gregor Jasny 
AuthorDate: Sun Feb 7 20:20:02 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Feb 7 20:20:02 2016 +0100

Apple: Enable -isystem for GNU Compiler >= 4 (#15953)

Due to #4662 -isystem support was disabled for all GNU Compilers
on Apple platforms. But the change was probably a just work around
for a broken compiler on Tiger (see 10837#c27206). So we tighten
the condition to only kick in for GCC versions earlier than 4.
That should ensure sane behavior for Xcode 3.2 and later.

diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index 764fbf9..d1ca85e 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -52,7 +52,7 @@ macro(__compiler_gnu lang)
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
   set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " 
   -E  > ")
   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "  
  -S  -o ")
-  if(NOT APPLE)
+  if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work 
around #4462
 set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
   endif()
 endmacro()

---

Summary of changes:
 Modules/Compiler/GNU.cmake |2 +-
 Source/CMakeVersion.cmake  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.1-1845-gacf58fe

2016-01-05 Thread Gregor Jasny via Cmake-commits

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  acf58fefebf43a7ea17fdc7cbe110c3b04cc63cd (commit)
   via  a928a051a370fee18cf799c3995161305f6b258e (commit)
  from  7385263f00a745033714a5072147e0c26743b6f6 (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=acf58fefebf43a7ea17fdc7cbe110c3b04cc63cd
commit acf58fefebf43a7ea17fdc7cbe110c3b04cc63cd
Merge: 7385263 a928a05
Author: Gregor Jasny 
AuthorDate: Tue Jan 5 13:23:06 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 5 13:23:06 2016 -0500

Merge topic 'xcode-escape-backslash' into next

a928a051 fixup! Xcode: Escape all backslashes in strings (#15328)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a928a051a370fee18cf799c3995161305f6b258e
commit a928a051a370fee18cf799c3995161305f6b258e
Author: Gregor Jasny 
AuthorDate: Tue Jan 5 19:18:20 2016 +0100
Commit: Gregor Jasny 
CommitDate: Tue Jan 5 19:21:22 2016 +0100

fixup! Xcode: Escape all backslashes in strings (#15328)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 0290643..3449648 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1686,7 +1686,7 @@ 
cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 }
 
   std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  cdir = this->ConvertToRelativeForXCode(cdir.c_str());
+  cdir = this->ConvertToRelativeForMake(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
   makecmd += " -f ";
@@ -2107,10 +2107,8 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   this->CurrentLocalGenerator
 ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
  plist.c_str());
-  std::string path =
-this->ConvertToRelativeForXCode(plist.c_str());
   buildSettings->AddAttribute("INFOPLIST_FILE",
-  this->CreateString(path.c_str()));
+  this->CreateString(plist));
   }
 else if(this->XcodeVersion >= 22)
   {
@@ -2156,10 +2154,8 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   this->CurrentLocalGenerator
 ->GenerateFrameworkInfoPList(gtgt, "$(EXECUTABLE_NAME)",
  plist.c_str());
-  std::string path =
-this->ConvertToRelativeForXCode(plist.c_str());
   buildSettings->AddAttribute("INFOPLIST_FILE",
-  this->CreateString(path.c_str()));
+  this->CreateString(plist));
   }
 else
   {
@@ -2199,10 +2195,8 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   this->CurrentLocalGenerator
 ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
  plist.c_str());
-  std::string path =
-this->ConvertToRelativeForXCode(plist.c_str());
   buildSettings->AddAttribute("INFOPLIST_FILE",
-  this->CreateString(path.c_str()));
+  this->CreateString(plist));
 
   }
 }
@@ -3880,12 +3874,6 @@ std::string 
cmGlobalXCodeGenerator::ConvertToRelativeForMake(const char* p)
 }
 
 //
-std::string cmGlobalXCodeGenerator::ConvertToRelativeForXCode(const char* p)
-{
-  return cmSystemTools::ConvertToOutputPath(p);
-}
-
-//
 std::string cmGlobalXCodeGenerator::RelativeToSource(const char* p)
 {
   // We force conversion because Xcode breakpoints do not work unless
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index c8a39df..b5fd13c 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -99,7 +99,6 @@ private:
   std::string XCodeEscapePath(const char* p);
   std::string RelativeToSource(const char* p);
   std::string RelativeToBinary(const char* p);
-  std::string ConvertToRelativeForXCode(const char* p);
   std::string ConvertToRelativeForMake(const char* p);
   void CreateCustomCommands(cmXCodeObject* buildPhases,
 cmXCodeObject* sourceBuildPhase,

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   20

[Cmake-commits] CMake branch, next, updated. v3.4.1-1837-gb03eb97

2016-01-02 Thread Gregor Jasny via Cmake-commits

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  b03eb971c6e5a282c975cc84531fba7caee43f67 (commit)
   via  6d962fb9bf94585bb58044502c4ce0e0294e6395 (commit)
   via  90b50b2e28d32bcf239d3f6bc4d1114756a78827 (commit)
  from  cab328fb37a3e12e75ce76879134d4ab206319bd (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=b03eb971c6e5a282c975cc84531fba7caee43f67
commit b03eb971c6e5a282c975cc84531fba7caee43f67
Merge: cab328f 6d962fb
Author: Gregor Jasny 
AuthorDate: Sat Jan 2 11:02:09 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Jan 2 11:02:09 2016 -0500

Merge topic 'xcode-escape-backslash' into next

6d962fb9 Xcode: Escape all backslashes in strings (#15328)
90b50b2e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d962fb9bf94585bb58044502c4ce0e0294e6395
commit 6d962fb9bf94585bb58044502c4ce0e0294e6395
Author: Gregor Jasny 
AuthorDate: Sun Dec 27 16:33:46 2015 +0100
Commit: Gregor Jasny 
CommitDate: Sat Jan 2 17:00:19 2016 +0100

Xcode: Escape all backslashes in strings (#15328)

Before this change backslashes in strings were escaped during compile
flags adds via AppendFlag(). But global flags like OTHER_CPLUSPLUSFLAGS
are not added as flags but as plain strings so they were not escaped
properly.

Now the escaping is performed within cmXCodeObject::PrintString() which
ensures that strings are always encoded.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 475efa8..0290643 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1693,7 +1693,6 @@ 
cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   makecmd += this->ConvertToRelativeForMake(
   (makefile+"$CONFIGURATION").c_str());
   makecmd += " all";
-  cmSystemTools::ReplaceString(makecmd, "\\ ", " ");
   buildphase->AddAttribute("shellScript",
this->CreateString(makecmd.c_str()));
   buildphase->AddAttribute("showEnvVarsInLog",
@@ -4022,8 +4021,8 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& 
flags,
 
   // We escape a flag as follows:
   //   - Place each flag in single quotes ''
-  //   - Escape a single quote as \\'
-  //   - Escape a backslash as  since it itself is an escape
+  //   - Escape a single quote as \'
+  //   - Escape a backslash as \\ since it itself is an escape
   // Note that in the code below we need one more level of escapes for
   // C string syntax in this source file.
   //
@@ -4043,16 +4042,16 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& 
flags,
   {
   if (this->XcodeVersion >= 40)
 {
-flags += "'''";
+flags += "'\\''";
 }
   else
 {
-flags += "'";
+flags += "\\'";
 }
   }
 else if(*c == '\\')
   {
-  flags += "";
+  flags += "";
   }
 else
   {
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index c59c360..5bc34c1 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -255,9 +255,9 @@ void cmXCodeObject::PrintString(std::ostream& 
os,std::string String)
   for(std::string::const_iterator i = String.begin();
   i != String.end(); ++i)
 {
-if(*i == '"')
+if(*i == '"' || *i == '\\')
   {
-  // Escape double-quotes.
+  // Escape double-quotes and backslashes.
   os << '\\';
   }
 os << *i;
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index acc0075..395c74b 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -3,6 +3,7 @@ include(RunCMake)
 run_cmake(XcodeFileType)
 run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
+run_cmake(XcodeObjectNeedsEscape)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
 run_cmake(XcodePreserveNonOptimizationFlags)
diff --git a/Tests/RunCMake/XcodeProject/XcodeObjectNeedsEscape-check.cmake 
b/Tests/RunCMake/XcodeProject/XcodeObjectNeedsEscape-check.cmake
new file mode 100644
index 000..c34e3fe
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeObjectNeedsEscape-check.cmake
@@ -0,0 +1,7 @@
+set(expect "-DKDESRCDIR=\"foo\"")
+file(STRINGS 
${RunCMake_TEST_BINARY_DIR}/XcodeObjectNeedsEscape.xcodeproj/project.pbxproj 
actual
+

[Cmake-commits] CMake branch, next, updated. v3.4.1-1695-gcaa83f4

2015-12-10 Thread Gregor Jasny via Cmake-commits

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  caa83f4e41630cd00e8e32f2330d2c1be045b95f (commit)
   via  565d080a9a1e133bda868e905226181b60e90356 (commit)
   via  34f5ef564aa94f2f66f35c708dbfca260b419e4b (commit)
  from  65b3b57e0b5d3c9e8f0b8fff5fa336c00a3e1644 (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=caa83f4e41630cd00e8e32f2330d2c1be045b95f
commit caa83f4e41630cd00e8e32f2330d2c1be045b95f
Merge: 65b3b57 565d080
Author: Gregor Jasny 
AuthorDate: Thu Dec 10 16:42:16 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 10 16:42:16 2015 -0500

Merge topic 'ios-universal' into next

565d080a Xcode: Add support for combined install on iOS
34f5ef56 iOS: Fix App Bundle layout


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=565d080a9a1e133bda868e905226181b60e90356
commit 565d080a9a1e133bda868e905226181b60e90356
Author: Ruslan Baratov 
AuthorDate: Thu Oct 8 03:09:34 2015 +0300
Commit: Gregor Jasny 
CommitDate: Thu Dec 10 22:36:12 2015 +0100

Xcode: Add support for combined install on iOS

This patch solves the problem of installing both: Device and Simulator
libraries on iOS. Before only one of them was installed.

If the IOS_INSTALL_COMBINED property is set on a target, a
special install hook will be activated which builds the corresponding
target and combines both at the install location.

The original patch was contributed by Ruslan Baratov, and polished by
Gregor Jasny.

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 931363c..a41d484 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -191,6 +191,7 @@ Properties on Targets
/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION
+   /prop_tgt/IOS_INSTALL_COMBINED
/prop_tgt/JOB_POOL_COMPILE
/prop_tgt/JOB_POOL_LINK
/prop_tgt/LABELS
diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 2116900..3f49572 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -257,6 +257,7 @@ Variables that Control the Build
/variable/CMAKE_INSTALL_NAME_DIR
/variable/CMAKE_INSTALL_RPATH
/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH
+   /variable/CMAKE_IOS_INSTALL_COMBINED
/variable/CMAKE_LANG_COMPILER_LAUNCHER
/variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
/variable/CMAKE_LANG_VISIBILITY_PRESET
diff --git a/Help/prop_tgt/IOS_INSTALL_COMBINED.rst 
b/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
new file mode 100644
index 000..59f67a7
--- /dev/null
+++ b/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
@@ -0,0 +1,11 @@
+IOS_INSTALL_COMBINED
+
+
+Build a combined (device and simulator) target when installing.
+
+When this property is set to set to false (which is the default) then it will
+either be built with the device SDK or the simulator SDK depending on the SDK
+set. But if this property is set to true then the target will at install time
+also be built for the corresponding SDK and combined into one library.
+
+This feature requires at least Xcode version 6.
diff --git a/Help/release/dev/ios-universal.rst 
b/Help/release/dev/ios-universal.rst
new file mode 100644
index 000..f96abed
--- /dev/null
+++ b/Help/release/dev/ios-universal.rst
@@ -0,0 +1,7 @@
+ios-universal
+-
+
+* When building for embedded Apple platforms like iOS CMake learned to build 
and
+  install combined targets which contain both a device and a simulator build.
+  This behavior can be enabled by setting the :prop_tgt:`IOS_INSTALL_COMBINED`
+  target property.
diff --git a/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst 
b/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
new file mode 100644
index 000..c5cb9b6
--- /dev/null
+++ b/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
@@ -0,0 +1,8 @@
+CMAKE_IOS_INSTALL_COMBINED
+--
+
+Default value for :prop_tgt:`IOS_INSTALL_COMBINED` of targets.
+
+This variable is used to initialize the :prop_tgt:`IOS_INSTALL_COMBINED`
+property on all the targets.  See that target property for additional
+information.
diff --git a/Modules/CMakeIOSInstallCombined.cmake 
b/Modules/CMakeIOSInstallCombined.cmake
new file mode 100644
index 000..f052a3b
--- /dev/null
+++ b/Modules/CMakeIOSInstallCombined.cmake
@@ -0,0 +1,297 @@
+

[Cmake-commits] CMake branch, next, updated. v3.4.1-1578-g23b5ca6

2015-12-03 Thread Gregor Jasny via Cmake-commits

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  23b5ca6d7461f3c166a0ab826c456bc30a370452 (commit)
   via  fc656fa4fe2926c7a50de91ff1b5564802ac4a7e (commit)
  from  97739fa35a165782eba503845a14f3eb769b0338 (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=23b5ca6d7461f3c166a0ab826c456bc30a370452
commit 23b5ca6d7461f3c166a0ab826c456bc30a370452
Merge: 97739fa fc656fa
Author: Gregor Jasny 
AuthorDate: Thu Dec 3 15:49:54 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 3 15:49:54 2015 -0500

Merge topic 'regex-explorer' into next

fc656fa4 cmake-gui: Add regex explorer window


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc656fa4fe2926c7a50de91ff1b5564802ac4a7e
commit fc656fa4fe2926c7a50de91ff1b5564802ac4a7e
Author: Gregor Jasny 
AuthorDate: Wed Nov 18 22:40:59 2015 +0100
Commit: Gregor Jasny 
CommitDate: Thu Dec 3 21:45:54 2015 +0100

cmake-gui: Add regex explorer window

diff --git a/Help/release/dev/regex-explorer.rst 
b/Help/release/dev/regex-explorer.rst
new file mode 100644
index 000..2147816
--- /dev/null
+++ b/Help/release/dev/regex-explorer.rst
@@ -0,0 +1,6 @@
+regex-explorer
+--
+
+* The Qt base CMake GUI got a Regular Expression Explorer which could be used 
to
+  create and evaluate regular expressions in real-time. The explorer window
+  is available via the ``Tools`` menu.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 66fd18b..cad11f5 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -113,12 +113,15 @@ set(SRCS
   QCMakeCacheView.h
   QCMakeWidgets.cxx
   QCMakeWidgets.h
+  RegexExplorer.cxx
+  RegexExplorer.h
   )
 QT4_WRAP_UI(UI_SRCS
   CMakeSetupDialog.ui
   Compilers.ui
   CrossCompiler.ui
   AddCacheEntry.ui
+  RegexExplorer.ui
   )
 QT4_WRAP_CPP(MOC_SRCS
   AddCacheEntry.h
@@ -128,6 +131,7 @@ QT4_WRAP_CPP(MOC_SRCS
   QCMake.h
   QCMakeCacheView.h
   QCMakeWidgets.h
+  RegexExplorer.h
   )
 QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
 
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 748dd7d..2b12834 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -33,6 +33,7 @@
 #include "QCMakeCacheView.h"
 #include "AddCacheEntry.h"
 #include "FirstConfigure.h"
+#include "RegexExplorer.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
 
@@ -125,6 +126,9 @@ CMakeSetupDialog::CMakeSetupDialog()
this, SLOT(doInstallForCommandLine()));
 #endif
   ToolsMenu->addSeparator();
+  ToolsMenu->addAction(tr("Regular Expression Explorer..."),
+   this, SLOT(doRegexExplorerDialog()));
+  ToolsMenu->addSeparator();
   ToolsMenu->addAction(tr(" in Output..."),
this, SLOT(doOutputFindDialog()),
QKeySequence::Find);
@@ -1272,6 +1276,12 @@ void CMakeSetupDialog::doOutputFindDialog()
 }
 }
 
+void CMakeSetupDialog::doRegexExplorerDialog()
+{
+  RegexExplorer dialog(this);
+  dialog.exec();
+}
+
 void CMakeSetupDialog::doOutputFindPrev()
 {
   doOutputFindNext(false);
diff --git a/Source/QtDialog/CMakeSetupDialog.h 
b/Source/QtDialog/CMakeSetupDialog.h
index 1b26c64..bfd2bc9 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -82,6 +82,7 @@ protected slots:
   void doOutputFindNext(bool directionForward = true);
   void doOutputFindPrev();
   void doOutputErrorNext();
+  void doRegexExplorerDialog();
 
 protected:
 
diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
new file mode 100644
index 000..dfcf048
--- /dev/null
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -0,0 +1,166 @@
+/*
+  CMake - Cross Platform Makefile Generator
+  Copyright 2015 Kitware, Inc., Gregor Jasny
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+*/
+
+#include "RegexExplorer.h"
+
+RegexExplorer::RegexExplorer(QWidget* p) : QDialog(p), m_matched(false)
+{
+  this->setupUi(this);
+
+  for(int i = 1; i < cmsys::RegularExpression::NSUBEXP; ++i)
+{
+

[Cmake-commits] CMake branch, next, updated. v3.4.0-1607-g1c27e7d

2015-12-02 Thread Gregor Jasny via Cmake-commits

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  1c27e7df4e033f981dde15f7731913ffd6750b03 (commit)
   via  b732f72a3dcda862b16e3b7a775f9d2b34e0d5be (commit)
  from  b2ae6a309c8e5cc729fc5269aa04f38b46311f53 (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=1c27e7df4e033f981dde15f7731913ffd6750b03
commit 1c27e7df4e033f981dde15f7731913ffd6750b03
Merge: b2ae6a3 b732f72
Author: Gregor Jasny 
AuthorDate: Wed Dec 2 12:10:32 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 2 12:10:32 2015 -0500

Merge topic 'regex-explorer' into next

b732f72a fixup! cmake-gui: Add regex explorer window


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b732f72a3dcda862b16e3b7a775f9d2b34e0d5be
commit b732f72a3dcda862b16e3b7a775f9d2b34e0d5be
Author: Gregor Jasny 
AuthorDate: Wed Dec 2 18:09:53 2015 +0100
Commit: Gregor Jasny 
CommitDate: Wed Dec 2 18:09:53 2015 +0100

fixup! cmake-gui: Add regex explorer window

diff --git a/Help/release/dev/regex-explorer.rst 
b/Help/release/dev/regex-explorer.rst
index 5c7ae3a..2147816 100644
--- a/Help/release/dev/regex-explorer.rst
+++ b/Help/release/dev/regex-explorer.rst
@@ -3,4 +3,4 @@ regex-explorer
 
 * The Qt base CMake GUI got a Regular Expression Explorer which could be used 
to
   create and evaluate regular expressions in real-time. The explorer window
-  is available via the ``Tools``menu.
+  is available via the ``Tools`` menu.
diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index b583d70..dfcf048 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -12,7 +12,7 @@
 
 #include "RegexExplorer.h"
 
-RegexExplorer::RegexExplorer(QWidget* p) : m_matched(false)
+RegexExplorer::RegexExplorer(QWidget* p) : QDialog(p), m_matched(false)
 {
   this->setupUi(this);
 
@@ -96,8 +96,8 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int 
index)
 return;
 }
 
-  QVariant data = matchNumber->itemData(index);
-  int idx = data.toInt();
+  QVariant itemData = matchNumber->itemData(index);
+  int idx = itemData.toInt();
 
   if(idx < 1 || idx >= cmsys::RegularExpression::NSUBEXP)
 {

---

Summary of changes:
 Help/release/dev/regex-explorer.rst |2 +-
 Source/QtDialog/RegexExplorer.cxx   |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-1550-g523ccb5

2015-11-30 Thread Gregor Jasny via Cmake-commits

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  523ccb5cf99486b8951bec2505c677310eee710a (commit)
   via  6e81fe754311f879d384d66cdade128afdff7313 (commit)
  from  48f4880a3d252fa8fd86896d55c88ee90a3a04af (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=523ccb5cf99486b8951bec2505c677310eee710a
commit 523ccb5cf99486b8951bec2505c677310eee710a
Merge: 48f4880 6e81fe7
Author: Gregor Jasny 
AuthorDate: Mon Nov 30 16:09:03 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 30 16:09:03 2015 -0500

Merge topic 'regex-explorer' into next

6e81fe75 cmake-gui: Add regex explorer window


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e81fe754311f879d384d66cdade128afdff7313
commit 6e81fe754311f879d384d66cdade128afdff7313
Author: Gregor Jasny 
AuthorDate: Wed Nov 18 22:40:59 2015 +0100
Commit: Gregor Jasny 
CommitDate: Mon Nov 30 22:08:39 2015 +0100

cmake-gui: Add regex explorer window

diff --git a/Help/release/dev/regex-explorer.rst 
b/Help/release/dev/regex-explorer.rst
new file mode 100644
index 000..5c7ae3a
--- /dev/null
+++ b/Help/release/dev/regex-explorer.rst
@@ -0,0 +1,6 @@
+regex-explorer
+--
+
+* The Qt base CMake GUI got a Regular Expression Explorer which could be used 
to
+  create and evaluate regular expressions in real-time. The explorer window
+  is available via the ``Tools``menu.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 66fd18b..cad11f5 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -113,12 +113,15 @@ set(SRCS
   QCMakeCacheView.h
   QCMakeWidgets.cxx
   QCMakeWidgets.h
+  RegexExplorer.cxx
+  RegexExplorer.h
   )
 QT4_WRAP_UI(UI_SRCS
   CMakeSetupDialog.ui
   Compilers.ui
   CrossCompiler.ui
   AddCacheEntry.ui
+  RegexExplorer.ui
   )
 QT4_WRAP_CPP(MOC_SRCS
   AddCacheEntry.h
@@ -128,6 +131,7 @@ QT4_WRAP_CPP(MOC_SRCS
   QCMake.h
   QCMakeCacheView.h
   QCMakeWidgets.h
+  RegexExplorer.h
   )
 QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
 
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 748dd7d..2b12834 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -33,6 +33,7 @@
 #include "QCMakeCacheView.h"
 #include "AddCacheEntry.h"
 #include "FirstConfigure.h"
+#include "RegexExplorer.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
 
@@ -125,6 +126,9 @@ CMakeSetupDialog::CMakeSetupDialog()
this, SLOT(doInstallForCommandLine()));
 #endif
   ToolsMenu->addSeparator();
+  ToolsMenu->addAction(tr("Regular Expression Explorer..."),
+   this, SLOT(doRegexExplorerDialog()));
+  ToolsMenu->addSeparator();
   ToolsMenu->addAction(tr(" in Output..."),
this, SLOT(doOutputFindDialog()),
QKeySequence::Find);
@@ -1272,6 +1276,12 @@ void CMakeSetupDialog::doOutputFindDialog()
 }
 }
 
+void CMakeSetupDialog::doRegexExplorerDialog()
+{
+  RegexExplorer dialog(this);
+  dialog.exec();
+}
+
 void CMakeSetupDialog::doOutputFindPrev()
 {
   doOutputFindNext(false);
diff --git a/Source/QtDialog/CMakeSetupDialog.h 
b/Source/QtDialog/CMakeSetupDialog.h
index 1b26c64..bfd2bc9 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -82,6 +82,7 @@ protected slots:
   void doOutputFindNext(bool directionForward = true);
   void doOutputFindPrev();
   void doOutputErrorNext();
+  void doRegexExplorerDialog();
 
 protected:
 
diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
new file mode 100644
index 000..b583d70
--- /dev/null
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -0,0 +1,166 @@
+/*
+  CMake - Cross Platform Makefile Generator
+  Copyright 2015 Kitware, Inc., Gregor Jasny
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+*/
+
+#include "RegexExplorer.h"
+
+RegexExplorer::RegexExplorer(QWidget* p) : m_matched(false)
+{
+  this->setupUi(this);
+
+  for(int i = 1; i < cmsys::RegularExpression::NSUBEXP; ++i)
+{
+

[Cmake-commits] CMake branch, next, updated. v3.4.0-1548-g48f4880

2015-11-30 Thread Gregor Jasny via Cmake-commits

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  48f4880a3d252fa8fd86896d55c88ee90a3a04af (commit)
   via  a31c85da5ed82d913eeb71ebbbd4d51af4625380 (commit)
  from  d5dcfed6747cda9f835988bd3d02ec4b4864fc54 (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=48f4880a3d252fa8fd86896d55c88ee90a3a04af
commit 48f4880a3d252fa8fd86896d55c88ee90a3a04af
Merge: d5dcfed a31c85d
Author: Gregor Jasny 
AuthorDate: Mon Nov 30 16:06:58 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 30 16:06:58 2015 -0500

Merge topic 'regex-explorer' into next

a31c85da fixup! cmake-gui: Add regex explorer window


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a31c85da5ed82d913eeb71ebbbd4d51af4625380
commit a31c85da5ed82d913eeb71ebbbd4d51af4625380
Author: Gregor Jasny 
AuthorDate: Mon Nov 30 22:02:44 2015 +0100
Commit: Gregor Jasny 
CommitDate: Mon Nov 30 22:02:44 2015 +0100

fixup! cmake-gui: Add regex explorer window

diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index 04fb5fb..b583d70 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -41,7 +41,9 @@ void RegexExplorer::on_regularExpression_textChanged(const 
QString& text)
 #else
   m_regex = text.toStdString();
 #endif
-  bool validExpression = m_regexParser.compile(m_regex);
+
+  bool validExpression =
+stripEscapes(m_regex) && m_regexParser.compile(m_regex);
   if(!validExpression)
 {
 m_regexParser.set_invalid();
@@ -115,3 +117,50 @@ void RegexExplorer::clearMatch()
   match0->clear();
   matchN->clear();
 }
+
+bool RegexExplorer::stripEscapes(std::string& source)
+{
+  const char* in = source.c_str();
+
+  std::string result;
+  result.reserve(source.size());
+
+  for(char inc = *in; inc != '\0'; inc = *++in)
+{
+if(inc == '\\')
+  {
+  char nextc = in[1];
+  if(nextc == 't')
+{
+result.append(1, '\t');
+in++;
+}
+  else if(nextc == 'n')
+{
+result.append(1, '\n');
+in++;
+}
+  else if(nextc == 't')
+{
+result.append(1, '\t');
+in++;
+}
+  else if(isalnum(nextc) || nextc == '\0')
+{
+return false;
+}
+  else
+{
+result.append(1, nextc);
+in++;
+}
+  }
+else
+  {
+result.append(1, inc);
+  }
+}
+
+source = result;
+return true;
+}
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index b758a08..2ac9c3e 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -35,6 +35,7 @@ private slots:
 
 private:
   static void setStatusColor(QWidget* widget, bool successful);
+  static bool stripEscapes(std::string& regex);
 
   void clearMatch();
 

---

Summary of changes:
 Source/QtDialog/RegexExplorer.cxx |   51 -
 Source/QtDialog/RegexExplorer.h   |1 +
 2 files changed, 51 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-1528-gf312371

2015-11-29 Thread Gregor Jasny via Cmake-commits

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  f3123711dfcaea5e1e340e4b0203f23e8e5fc3d9 (commit)
   via  e43f7fc454d9f8551ca6b2740326ad89ebc05dd3 (commit)
   via  9cbb8058ca843c1a3f3b67d155718b03a3e91d6c (commit)
   via  61f677edf8bd1f24ee4db39984f7a18a92ad533e (commit)
   via  74a6d43ea04cd0a2813076feb04f623a52c4928d (commit)
   via  2b87b58dced5ebab753f1cca8b4a90f2821bc450 (commit)
  from  ac4154fb048ce3291651ae97d4d92b2a6440962b (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=f3123711dfcaea5e1e340e4b0203f23e8e5fc3d9
commit f3123711dfcaea5e1e340e4b0203f23e8e5fc3d9
Merge: ac4154f e43f7fc
Author: Gregor Jasny 
AuthorDate: Sun Nov 29 09:54:34 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Nov 29 09:54:34 2015 -0500

Merge topic 'regex-explorer' into next

e43f7fc4 cmake-gui: Add regex explorer window
9cbb8058 CMake Nightly Date Stamp
61f677ed CMake Nightly Date Stamp
74a6d43e CMake Nightly Date Stamp
2b87b58d CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e43f7fc454d9f8551ca6b2740326ad89ebc05dd3
commit e43f7fc454d9f8551ca6b2740326ad89ebc05dd3
Author: Gregor Jasny 
AuthorDate: Wed Nov 18 22:40:59 2015 +0100
Commit: Gregor Jasny 
CommitDate: Sun Nov 29 15:52:23 2015 +0100

cmake-gui: Add regex explorer window

diff --git a/Help/release/dev/regex-explorer.rst 
b/Help/release/dev/regex-explorer.rst
new file mode 100644
index 000..5c7ae3a
--- /dev/null
+++ b/Help/release/dev/regex-explorer.rst
@@ -0,0 +1,6 @@
+regex-explorer
+--
+
+* The Qt base CMake GUI got a Regular Expression Explorer which could be used 
to
+  create and evaluate regular expressions in real-time. The explorer window
+  is available via the ``Tools``menu.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 66fd18b..cad11f5 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -113,12 +113,15 @@ set(SRCS
   QCMakeCacheView.h
   QCMakeWidgets.cxx
   QCMakeWidgets.h
+  RegexExplorer.cxx
+  RegexExplorer.h
   )
 QT4_WRAP_UI(UI_SRCS
   CMakeSetupDialog.ui
   Compilers.ui
   CrossCompiler.ui
   AddCacheEntry.ui
+  RegexExplorer.ui
   )
 QT4_WRAP_CPP(MOC_SRCS
   AddCacheEntry.h
@@ -128,6 +131,7 @@ QT4_WRAP_CPP(MOC_SRCS
   QCMake.h
   QCMakeCacheView.h
   QCMakeWidgets.h
+  RegexExplorer.h
   )
 QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
 
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 748dd7d..2b12834 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -33,6 +33,7 @@
 #include "QCMakeCacheView.h"
 #include "AddCacheEntry.h"
 #include "FirstConfigure.h"
+#include "RegexExplorer.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
 
@@ -125,6 +126,9 @@ CMakeSetupDialog::CMakeSetupDialog()
this, SLOT(doInstallForCommandLine()));
 #endif
   ToolsMenu->addSeparator();
+  ToolsMenu->addAction(tr("Regular Expression Explorer..."),
+   this, SLOT(doRegexExplorerDialog()));
+  ToolsMenu->addSeparator();
   ToolsMenu->addAction(tr(" in Output..."),
this, SLOT(doOutputFindDialog()),
QKeySequence::Find);
@@ -1272,6 +1276,12 @@ void CMakeSetupDialog::doOutputFindDialog()
 }
 }
 
+void CMakeSetupDialog::doRegexExplorerDialog()
+{
+  RegexExplorer dialog(this);
+  dialog.exec();
+}
+
 void CMakeSetupDialog::doOutputFindPrev()
 {
   doOutputFindNext(false);
diff --git a/Source/QtDialog/CMakeSetupDialog.h 
b/Source/QtDialog/CMakeSetupDialog.h
index 1b26c64..bfd2bc9 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -82,6 +82,7 @@ protected slots:
   void doOutputFindNext(bool directionForward = true);
   void doOutputFindPrev();
   void doOutputErrorNext();
+  void doRegexExplorerDialog();
 
 protected:
 
diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
new file mode 100644
index 000..04fb5fb
--- /dev/null
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -0,0 +1,117 @@
+/*
+  CMake - Cross Platform Makefile Generator
+  Copyright 2015 Kitware, Inc., Gregor Jasny
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+

[Cmake-commits] CMake branch, next, updated. v3.4.0-1336-gfaf5e0e

2015-11-13 Thread Gregor Jasny via Cmake-commits

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  faf5e0ebdae22a8bac15d4b3fd1239e645d70ffe (commit)
   via  f6f03ed4cc4271384ec934fd5867ccbce4e798f2 (commit)
   via  9f053763d769780385fbc8e3e936f1c996d2e00a (commit)
   via  415863e6d40f3c09d43b41ef16e0a7ffa0006063 (commit)
  from  3597b371f980b961baaec9990c70902ec27d0dea (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=faf5e0ebdae22a8bac15d4b3fd1239e645d70ffe
commit faf5e0ebdae22a8bac15d4b3fd1239e645d70ffe
Merge: 3597b37 f6f03ed
Author: Gregor Jasny 
AuthorDate: Fri Nov 13 08:02:43 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Nov 13 08:02:43 2015 -0500

Merge topic 'non-xcode-framework-layout' into next

f6f03ed4 Add test for OSX/iOS Framework directory structure (#15833)
9f053763 Fix iOS Framework directory structure (#15833)
415863e6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6f03ed4cc4271384ec934fd5867ccbce4e798f2
commit f6f03ed4cc4271384ec934fd5867ccbce4e798f2
Author: Gregor Jasny 
AuthorDate: Fri Nov 13 12:59:18 2015 +0100
Commit: Gregor Jasny 
CommitDate: Fri Nov 13 13:58:53 2015 +0100

Add test for OSX/iOS Framework directory structure (#15833)

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 1a0019f..a6cbf86 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -239,6 +239,12 @@ if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3)
   add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION})
 endif()
 
+if(NOT XCODE
+AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
+AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
+  add_RunCMake_test(Framework)
+endif()
+
 add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
diff --git a/Tests/RunCMake/Framework/CMakeLists.txt 
b/Tests/RunCMake/Framework/CMakeLists.txt
new file mode 100644
index 000..6dd8cdf
--- /dev/null
+++ b/Tests/RunCMake/Framework/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Framework/FrameworkLayout.cmake 
b/Tests/RunCMake/Framework/FrameworkLayout.cmake
new file mode 100644
index 000..107afdf
--- /dev/null
+++ b/Tests/RunCMake/Framework/FrameworkLayout.cmake
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.4)
+enable_language(C)
+
+add_library(Framework SHARED foo.c)
+set_target_properties(Framework PROPERTIES FRAMEWORK TRUE)
diff --git a/Tests/RunCMake/Framework/OSXFrameworkLayout-build-check.cmake 
b/Tests/RunCMake/Framework/OSXFrameworkLayout-build-check.cmake
new file mode 100644
index 000..27d10d8
--- /dev/null
+++ b/Tests/RunCMake/Framework/OSXFrameworkLayout-build-check.cmake
@@ -0,0 +1,20 @@
+set(framework-dir "${RunCMake_TEST_BINARY_DIR}/Framework.framework")
+set(plist-file "${framework-dir}/Resources/Info.plist")
+set(framework-library "${framework-dir}/Framework")
+set(framework-versions "${framework-dir}/Versions")
+
+if(NOT IS_DIRECTORY ${framework-dir})
+  message(SEND_ERROR "Framework not found at ${framework-dir}")
+endif()
+
+if(NOT EXISTS ${plist-file})
+  message(SEND_ERROR "plist file not found at ${plist-file}")
+endif()
+
+if(NOT EXISTS ${framework-library})
+  message(SEND_ERROR "Framework library not found at ${framework-library}")
+endif()
+
+if(NOT EXISTS ${framework-versions})
+  message(SEND_ERROR "Framework versions not found at ${framework-versions}")
+endif()
diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake 
b/Tests/RunCMake/Framework/RunCMakeTest.cmake
new file mode 100644
index 000..d810283
--- /dev/null
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -0,0 +1,33 @@
+include(RunCMake)
+
+# iOS
+
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/iOSFrameworkLayout-build)
+set(RunCMake_TEST_NO_CLEAN 1)
+set(RunCMake_TEST_OPTIONS 
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/ios.cmake")
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+run_cmake(FrameworkLayout)
+run_cmake_command(iOSFrameworkLayout-build ${CMAKE_COMMAND} --build .)
+
+unset(RunCMake_TEST_BINARY_DIR)
+unset(RunCMake_TEST_NO_CLEAN)
+unset(RunCMake_TEST_OPTIONS)
+
+# OSX
+
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/OSXFrameworkLayout-build)
+set(RunCMake_TEST_NO_CLEAN 1)
+set(RunCMake_TEST_OPTIONS

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1201-gacd292f

2015-10-30 Thread Gregor Jasny via Cmake-commits

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  acd292f497cb88d2212be5fe0752dadb05bc9c2a (commit)
   via  136104740663b3310616bec51b2cec7f807715ce (commit)
   via  a375702eaa961a496b9420a836c336d884e9cbf3 (commit)
  from  31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (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=acd292f497cb88d2212be5fe0752dadb05bc9c2a
commit acd292f497cb88d2212be5fe0752dadb05bc9c2a
Merge: 31e92e6 1361047
Author: Gregor Jasny 
AuthorDate: Fri Oct 30 17:45:03 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 30 17:45:03 2015 -0400

Merge topic 'xcode-lastupgradecheck' into next

13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
a375702e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=136104740663b3310616bec51b2cec7f807715ce
commit 136104740663b3310616bec51b2cec7f807715ce
Author: Gregor Jasny 
AuthorDate: Fri Oct 30 22:03:52 2015 +0100
Commit: Gregor Jasny 
CommitDate: Fri Oct 30 22:28:04 2015 +0100

Xcode: Set LastUpgradeCheck to current Xcode version (#15817)

This prevents the project settings upgrade warning.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index da8c814..2df07cb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3398,6 +3398,9 @@ bool cmGlobalXCodeGenerator
 group = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
 group->AddAttribute("BuildIndependentTargetsInParallel",
 this->CreateString("YES"));
+std::ostringstream v;
+v << std::setfill('0') << std::setw(4) << XcodeVersion * 10;
+group->AddAttribute("LastUpgradeCheck", this->CreateString(v.str()));
 this->RootObject->AddAttribute("attributes", group);
 if (this->XcodeVersion >= 32)
   this->RootObject->AddAttribute("compatibilityVersion",

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGlobalXCodeGenerator.cxx |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-923-g8fbc8e4

2015-10-23 Thread Gregor Jasny via Cmake-commits

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  8fbc8e473b347d69331cd120aea3dd6c33e98599 (commit)
   via  601e6e1ad10b83dcb5ad09d061b04e6974cda283 (commit)
  from  88b9b0a6f138fa933cd9d286c02fe5a7e255080a (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=8fbc8e473b347d69331cd120aea3dd6c33e98599
commit 8fbc8e473b347d69331cd120aea3dd6c33e98599
Merge: 88b9b0a 601e6e1
Author: Gregor Jasny 
AuthorDate: Fri Oct 23 13:30:42 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 23 13:30:42 2015 -0400

Merge topic 'xcode-optimization-flags' into next

601e6e1a Xcode: Use regular expression to extract all optimisation flags 
(#15794)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=601e6e1ad10b83dcb5ad09d061b04e6974cda283
commit 601e6e1ad10b83dcb5ad09d061b04e6974cda283
Author: Gregor Jasny 
AuthorDate: Sun Oct 18 21:53:12 2015 +0200
Commit: Gregor Jasny 
CommitDate: Fri Oct 23 19:29:09 2015 +0200

Xcode: Use regular expression to extract all optimisation flags (#15794)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index bc05aea..0e3af88 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1612,6 +1612,39 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const 
char* flag,
 }
 
 //
+// This function removes each matching occurrence of the expression and
+// returns the last one (i.e., the dominant flag in GCC)
+std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
+ int matchIndex,
+ std::string& flags)
+{
+  std::string retFlag;
+
+  cmsys::RegularExpression regex(exp);
+  assert(regex.is_valid());
+  if(!regex.is_valid())
+{
+return retFlag;
+}
+
+  std::string::size_type offset = 0;
+
+  while(regex.find(flags.c_str() + offset))
+{
+const std::string::size_type startPos = offset + regex.start(matchIndex);
+const std::string::size_type endPos = offset + regex.end(matchIndex);
+const std::string::size_type size = endPos - startPos;
+
+offset = startPos + 1;
+
+retFlag.assign(flags, startPos, size);
+flags.replace(startPos, size, size, ' ');
+}
+
+  return retFlag;
+}
+
+//
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 cmTarget& target,
@@ -2227,9 +2260,7 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   bool same_gflags = true;
   std::map gflags;
   std::string const* last_gflag = 0;
-  char optLevel[2];
-  optLevel[0] = '0';
-  optLevel[1] = 0;
+  std::string optLevel = "0";
 
   // Minimal map of flags to build settings.
   for (std::set::iterator li = languages.begin();
@@ -2237,14 +2268,15 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 {
 std::string& flags = cflags[*li];
 std::string& gflag = gflags[*li];
-std::string oflag = this->ExtractFlag("-O", flags);
-if(oflag.size() == 3)
+std::string oflag =
+  this->ExtractFlagRegex("(^| )(-Ofast|-Os|-O[0-9]*)( |$)", 2, flags);
+if(oflag.size() == 2)
   {
-  optLevel[0] = oflag[2];
+  optLevel = "1";
   }
-if(oflag.size() == 2)
+else if(oflag.size() > 2)
   {
-  optLevel[0] = '1';
+  optLevel = oflag.substr(2);
   }
 gflag = this->ExtractFlag("-g", flags);
 // put back gdwarf-2 if used since there is no way
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..791324d 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -151,6 +151,8 @@ private:
cmXCodeObject* buildSettings,
const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
+  std::string ExtractFlagRegex(const char* exp, int matchIndex,
+   std::string& flags);
   void SortXCodeObjects();
   // delete all objects in the this->XCodeObjects vector.
   void ClearXCodeObjects();
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8ab618b..7901ec0 100644
---

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-925-gaddb1da

2015-10-23 Thread Gregor Jasny via Cmake-commits

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  addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (commit)
   via  a91eebebdb2a012c233db7869ec0ade534c4dd57 (commit)
  from  8fbc8e473b347d69331cd120aea3dd6c33e98599 (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=addb1dad4f1f99e054f3fc3e0f94d571ef8842c8
commit addb1dad4f1f99e054f3fc3e0f94d571ef8842c8
Merge: 8fbc8e4 a91eebe
Author: Gregor Jasny 
AuthorDate: Fri Oct 23 16:21:11 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 23 16:21:11 2015 -0400

Merge topic 'xcode-watch-and-tvos' into next

a91eebeb Xcode: Recognise Watch and TV OS as embedded platforms


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a91eebebdb2a012c233db7869ec0ade534c4dd57
commit a91eebebdb2a012c233db7869ec0ade534c4dd57
Author: Gregor Jasny 
AuthorDate: Fri Oct 23 22:19:43 2015 +0200
Commit: Gregor Jasny 
CommitDate: Fri Oct 23 22:19:43 2015 +0200

Xcode: Recognise Watch and TV OS as embedded platforms

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a1f143a..148b4a8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2407,10 +2407,23 @@ bool cmMakefile::PlatformIsAppleIos() const
   sdkRoot = this->GetSafeDefinition("CMAKE_OSX_SYSROOT");
   sdkRoot = cmSystemTools::LowerCase(sdkRoot);
 
-  return sdkRoot.find("iphoneos") == 0 ||
- sdkRoot.find("/iphoneos") != std::string::npos ||
- sdkRoot.find("iphonesimulator") == 0 ||
- sdkRoot.find("/iphonesimulator") != std::string::npos;
+  const std::string embedded[] =
+{
+"appletvos", "appletvsimulator",
+"iphoneos", "iphonesimulator",
+"watchos", "watchsimulator",
+};
+
+  for(size_t i = 0; i < sizeof(embedded) / sizeof(embedded[0]); ++i)
+{
+if(sdkRoot.find(embedded[i]) == 0 ||
+   sdkRoot.find(std::string("/") + embedded[i]) != std::string::npos)
+  {
+  return true;
+  }
+}
+
+   return false;
 }
 
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8ab618b..3b7b9f4 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -55,6 +55,38 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 endif()
 
 if(NOT XCODE_VERSION VERSION_LESS 7)
+  set(RunCMake_TEST_BINARY_DIR 
${RunCMake_BINARY_DIR}/XcodeBundlesWatchOS-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DTEST_WATCHOS=ON")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeBundles)
+  run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7.1)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesTvOS-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DTEST_TVOS=ON")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeBundles)
+  run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7)
   set(RunCMake_TEST_OPTIONS 
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake")
   run_cmake(XcodeTbdStub)
   unset(RunCMake_TEST_OPTIONS)
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake 
b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index 2cbccfa..0fdc6af 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -10,6 +10,22 @@ if(TEST_IOS)
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 endif(TEST_IOS)
 
+if(TEST_WATCHOS)
+  set(CMAKE_OSX_SYSROOT watchos)
+  set(CMAKE_OSX_ARCHITECTURES "armv7k")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+endif()
+
+if(TEST_TVOS)
+  set(CMAKE_OSX_SYSROOT appletvos)
+  set(CMAKE_OSX_ARCHITECTURES "arm64")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+endif()
+
 # App Bundle
 
 add_executable(AppBundle MACOSX_BUNDLE main.m)
@@

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-813-g8ab1833

2015-10-21 Thread Gregor Jasny via Cmake-commits

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  8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit)
   via  cee12fd8a8c10258e0dde6cb7c44b64eaf65712c (commit)
  from  998a7db7d498dc96407ad960f24d5294859d889b (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=8ab1833c2ad99fa882b7aa85ac87ded78c580576
commit 8ab1833c2ad99fa882b7aa85ac87ded78c580576
Merge: 998a7db cee12fd
Author: Gregor Jasny 
AuthorDate: Wed Oct 21 13:31:43 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Oct 21 13:31:43 2015 -0400

Merge topic 'xcode-optimization-flags' into next

cee12fd8 Xcode: Test that extraction of -O flags preserves others


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
commit cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
Author: Gregor Jasny 
AuthorDate: Wed Oct 21 19:25:13 2015 +0200
Commit: Gregor Jasny 
CommitDate: Wed Oct 21 19:25:13 2015 +0200

Xcode: Test that extraction of -O flags preserves others

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index a8c6816..7901ec0 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveNonOptimizationFlags)
 run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
diff --git 
a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
new file mode 100644
index 000..2f6c03d
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
@@ -0,0 +1,8 @@
+file(STRINGS 
${RunCMake_TEST_BINARY_DIR}/XcodePreserveNonOptimizationFlags.xcodeproj/project.pbxproj
 actual
+ REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;")
+foreach(expect "-DA" "-DB +-DC" "-DD")
+  if(NOT "${actual}" MATCHES "${expect}")
+message(SEND_ERROR "The actual project contains the lines:\n ${actual}\n"
+  "which do not match expected regex:\n ${expect}\n")
+  endif()
+endforeach()
diff --git 
a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
new file mode 100644
index 000..16f0381
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported 
configuration types")
+
+project(XcodePreserveNonOptimizationFlags CXX)
+
+add_library(preserveStart STATIC foo.cpp)
+set_property(TARGET preserveStart PROPERTY COMPILE_OPTIONS -DA -O1)
+
+add_library(preserveBoth STATIC foo.cpp)
+set_property(TARGET preserveBoth PROPERTY COMPILE_OPTIONS -DB -O1 -DC)
+
+add_library(preserveEnd STATIC foo.cpp)
+set_property(TARGET preserveEnd PROPERTY COMPILE_OPTIONS -O1 -DD)

---

Summary of changes:
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |1 +
 .../XcodePreserveNonOptimizationFlags-check.cmake  |8 
 .../XcodeProject/XcodePreserveNonOptimizationFlags.cmake   |   12 
 3 files changed, 21 insertions(+)
 create mode 100644 
Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
 create mode 100644 
Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-733-g03c0c9c

2015-10-20 Thread Gregor Jasny via Cmake-commits

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  03c0c9cc4098108010dc115bbdde4158fe423a40 (commit)
   via  18f848549bcbe4de8bfee66762304c2d241965fb (commit)
   via  b004a2d4798afd1747e8f52f52a7184890eb606c (commit)
   via  23520f1dca774bdb9aac3b0e264447d822d716de (commit)
   via  0b75f567d2ceb3de072ce50cfc9609a1760c35ac (commit)
   via  eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961 (commit)
  from  b440006bcad4df6916b90b7505352cc866bf8b96 (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=03c0c9cc4098108010dc115bbdde4158fe423a40
commit 03c0c9cc4098108010dc115bbdde4158fe423a40
Merge: b440006 18f8485
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 16:50:12 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 16:50:12 2015 -0400

Merge topic 'xcode-optimization-flags' into next

18f84854 Xcode: Add test case for bug report (#15794)
b004a2d4 fixup! Add test case for Xcode optimisation level settings (#15794)
23520f1d Use regex itself to check for white spaces around flag
0b75f567 Xcode: Use regular expression to extract all optimisation flags 
(#15794)
eefcb1e9 Add test case for Xcode optimisation level settings (#15794)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18f848549bcbe4de8bfee66762304c2d241965fb
commit 18f848549bcbe4de8bfee66762304c2d241965fb
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 22:01:29 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 22:01:29 2015 +0200

Xcode: Add test case for bug report (#15794)

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b716f0d..a8c6816 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
 endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
new file mode 100644
index 000..332906f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
@@ -0,0 +1,7 @@
+set(expect "-ObjC")
+file(STRINGS 
${RunCMake_TEST_BINARY_DIR}/XcodePreserveObjcFlag.xcodeproj/project.pbxproj 
actual
+ REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;" LIMIT_COUNT 1)
+if(NOT "${actual}" MATCHES "${expect}")
+  message(SEND_ERROR "The actual project contains the line:\n ${actual}\n"
+"which does not match expected regex:\n ${expect}\n")
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
new file mode 100644
index 000..64db633
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
@@ -0,0 +1,6 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported 
configuration types")
+
+project(XcodePreserveObjcFlag CXX)
+
+add_library(foo STATIC foo.cpp)
+set_target_properties(foo PROPERTIES COMPILE_OPTIONS -ObjC)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b004a2d4798afd1747e8f52f52a7184890eb606c
commit b004a2d4798afd1747e8f52f52a7184890eb606c
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 21:59:42 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 21:59:42 2015 +0200

fixup! Add test case for Xcode optimisation level settings (#15794)

diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake 
b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
index 53da440..e14bf80 100644
--- a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
@@ -4,8 +4,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 
 project(XcodeOptimizationFlags CXX)
 
-message(STATUS "NONE ${CMAKE_CXX_FLAGS} CXX ${CMAKE_CXX_FLAGS_RELEASE}")
-
 add_library(fooO1 STATIC foo.cpp)
 set_target_properties(fooO1 PROPERTIES COMPILE_OPTIONS -O1)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23520f1dca774bdb9aac3b0e264447d822d716de
commit 23520f1dca774bdb9aac3b0e264447d822d716de
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 21:39:45 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 21:39:45 2015 +0200

Use regex itself to check for white spaces

[Cmake-commits] CMake branch, next, updated. v3.3.1-2926-g4653dc3

2015-09-14 Thread Gregor Jasny via Cmake-commits

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  4653dc36efc23e6a35449521a7d7a7688b0ab288 (commit)
   via  c4c34af1a8e951026178db532f18660e0a7f28bf (commit)
   via  40a85b503c9eaa579c5b497f7f7155911f7a67c3 (commit)
  from  35f46e30fe43345610408874db2504614bc72d47 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4653dc36efc23e6a35449521a7d7a7688b0ab288
commit 4653dc36efc23e6a35449521a7d7a7688b0ab288
Merge: 35f46e3 c4c34af
Author: Gregor Jasny 
AuthorDate: Mon Sep 14 15:18:41 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 14 15:18:41 2015 -0400

Merge topic 'xcode-support-system-include' into next

c4c34af1 Swift: Add includes to OTHER_SWIFT_FLAGS in Xcode
40a85b50 Xcode: Obey SYSTEM keyword for includes (#15687)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4c34af1a8e951026178db532f18660e0a7f28bf
commit c4c34af1a8e951026178db532f18660e0a7f28bf
Author: Gregor Jasny 
AuthorDate: Mon Sep 14 21:04:17 2015 +0200
Commit: Gregor Jasny 
CommitDate: Mon Sep 14 21:15:28 2015 +0200

Swift: Add includes to OTHER_SWIFT_FLAGS in Xcode

diff --git a/Modules/CMakeSwiftInformation.cmake 
b/Modules/CMakeSwiftInformation.cmake
index 61ad928..85d3143 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -13,6 +13,7 @@
 #  License text for the above reference.)
 
 set(CMAKE_Swift_OUTPUT_EXTENSION .o)
+set(CMAKE_INCLUDE_FLAG_Swift "-I")
 
 # Load compiler-specific information.
 if(CMAKE_Swift_COMPILER_ID)
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index e131ddc..de1e506 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2300,6 +2300,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   buildSettings->AddAttribute("OTHER_CFLAGS",
   this->CreateString(flags.c_str()));
   }
+else if (*li == "Swift")
+  {
+  buildSettings->AddAttribute("OTHER_SWIFT_FLAGS",
+  this->CreateString(flags.c_str()));
+  }
 }
 
   // Add Fortran source format attribute if property is set.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40a85b503c9eaa579c5b497f7f7155911f7a67c3
commit 40a85b503c9eaa579c5b497f7f7155911f7a67c3
Author: Gregor Jasny 
AuthorDate: Mon Aug 31 22:33:37 2015 +0200
Commit: Gregor Jasny 
CommitDate: Mon Sep 14 21:15:11 2015 +0200

Xcode: Obey SYSTEM keyword for includes (#15687)

CMake used to put all header search paths into HEADER_SEARCH_PATHS
attribute. Unfortunately this attribute does not support to declare
a search path as a system include.

As a hack one could add a -isystem /path to the cflags but then include
ordering is not deterministic. A better approach was chosen with this
patch by not filling HEADER_SEARCH_PATHS at all and to populate
the C, C++, and Fortran flags directly. The include paths used by
Xcode should be now identical to the ones used by Unix Makefiles and
Ninja generator.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 33babec..e131ddc 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2177,34 +2177,27 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 this->CreateString("NO"));
 }
 
-  BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
-  BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt,
- "C", configName);
-  std::set emitted;
-  emitted.insert("/System/Library/Frameworks");
-  for(std::vector::iterator i = includes.begin();
-  i != includes.end(); ++i)
+  for(std::set::iterator li = languages.begin();
+  li != languages.end(); ++li)
 {
-if(this->NameResolvesToFramework(i->c_str()))
-  {
-  std::string frameworkDir = *i;
-  frameworkDir += "/../";
-  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
-  if(emitted.insert(frameworkDir).second)
-{
-fdirs.Add(this->XCodeEscapePath(frameworkDir.c_str()).c_str());
-}
-  }
-else
+std::vector includes;
+this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li);
+
+

[Cmake-commits] CMake branch, next, updated. v3.3.1-2822-g34141ce

2015-09-09 Thread Gregor Jasny via Cmake-commits

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  34141ce58174d8180359bd95389c25255e8cf2b7 (commit)
   via  86a032131804072d41d80d57cd569657372109ab (commit)
  from  8d31860874ab4968b69ea93d6240fa66fe1bb60c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34141ce58174d8180359bd95389c25255e8cf2b7
commit 34141ce58174d8180359bd95389c25255e8cf2b7
Merge: 8d31860 86a0321
Author: Gregor Jasny 
AuthorDate: Wed Sep 9 15:52:46 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Sep 9 15:52:46 2015 -0400

Merge topic 'apple-no-libnetwork' into next

86a03213 fixup! Do not use libnetwork on Apple platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86a032131804072d41d80d57cd569657372109ab
commit 86a032131804072d41d80d57cd569657372109ab
Author: Gregor Jasny 
AuthorDate: Wed Sep 9 21:37:58 2015 +0200
Commit: Gregor Jasny 
CommitDate: Wed Sep 9 21:40:13 2015 +0200

fixup! Do not use libnetwork on Apple platforms

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index f3a99d0..39b70c0 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -43,6 +43,14 @@ if(WIN32)
   set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton")
 endif()
 
+# Starting with OSX 10.11 there is an unrelated libnetwork library which will
+# be picked up during curl configuration. Linking against this library is
+# unnecessary and breaks backward compatibility of the resulting binaries
+# because libnetwork is unavailable on older OSX versions.
+if(APPLE)
+  set(HAVE_LIBNETWORK 0 CACHE INTERNAL "Do not use libnetwork")
+endif(APPLE)
+
 # Disable warnings to avoid changing 3rd party code.
 if(CMAKE_C_COMPILER_ID MATCHES
 "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
@@ -347,9 +355,7 @@ if(BEOS)
   check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI)
 endif(BEOS)
 
-if(NOT APPLE)
-  check_library_exists_concat("network" recv HAVE_LIBNETWORK)
-endif(NOT APPLE)
+check_library_exists_concat("network" recv HAVE_LIBNETWORK)
 
 if(NOT NOT_NEED_LIBNSL)
   check_library_exists_concat("nsl"gethostbyname  HAVE_LIBNSL)

---

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2773-gcfbf387

2015-09-06 Thread Gregor Jasny via Cmake-commits

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  cfbf38704d2ee4caedf3fff51244855b076a152d (commit)
   via  9cdf6ef48d62fed477cc9cf48995d7c91382f5f6 (commit)
   via  1aa29f0db614f1292cff24633d61218d82490d1e (commit)
  from  6985b37195c2b0336f3702cba64fb83d52a7d2b1 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbf38704d2ee4caedf3fff51244855b076a152d
commit cfbf38704d2ee4caedf3fff51244855b076a152d
Merge: 6985b37 9cdf6ef
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 13:20:30 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 6 13:20:30 2015 -0400

Merge topic 'more-swift2-fixes' into next

9cdf6ef4 Swift: Add proper Swift compiler test
1aa29f0d Swift: Remove positive Swift language tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdf6ef48d62fed477cc9cf48995d7c91382f5f6
commit 9cdf6ef48d62fed477cc9cf48995d7c91382f5f6
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 18:19:18 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 18:19:18 2015 +0200

Swift: Add proper Swift compiler test

This catches for example the unavailability of Swift with
Xcode Beta6 and macosx10.10 SDK.

diff --git a/Modules/CMakeTestSwiftCompiler.cmake 
b/Modules/CMakeTestSwiftCompiler.cmake
index 9186426..89849fb 100644
--- a/Modules/CMakeTestSwiftCompiler.cmake
+++ b/Modules/CMakeTestSwiftCompiler.cmake
@@ -12,4 +12,54 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(CMAKE_Swift_COMPILER_WORKS 1)
+if(CMAKE_Swift_COMPILER_FORCED)
+  # The compiler configuration was forced by the user.
+  # Assume the user has configured all compiler information.
+  set(CMAKE_Swift_COMPILER_WORKS TRUE)
+  return()
+endif()
+
+include(CMakeTestCompilerCommon)
+
+# Remove any cached result from an older CMake version.
+# We now store this in CMakeSwiftCompiler.cmake.
+unset(CMAKE_Swift_COMPILER_WORKS CACHE)
+
+# This file is used by EnableLanguage in cmGlobalGenerator to
+# determine that that selected C++ compiler can actually compile
+# and link the most basic of programs.   If not, a fatal error
+# is set and cmake stops processing commands and will not generate
+# any makefiles or projects.
+if(NOT CMAKE_Swift_COMPILER_WORKS)
+  PrintTestCompilerStatus("Swift" "")
+  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
+"import Foundation\n"
+"print(\"CMake\")\n")
+  try_compile(CMAKE_Swift_COMPILER_WORKS ${CMAKE_BINARY_DIR}
+${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
+OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT)
+  # Move result from cache to normal variable.
+  set(CMAKE_Swift_COMPILER_WORKS ${CMAKE_Swift_COMPILER_WORKS})
+  unset(CMAKE_Swift_COMPILER_WORKS CACHE)
+  set(Swift_TEST_WAS_RUN 1)
+endif()
+
+if(NOT CMAKE_Swift_COMPILER_WORKS)
+  PrintTestCompilerStatus("Swift" " -- broken")
+  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+"Determining if the Swift compiler works failed with "
+"the following output:\n${__CMAKE_Swift_COMPILER_OUTPUT}\n\n")
+  message(FATAL_ERROR "The Swift compiler \"${CMAKE_Swift_COMPILER}\" "
+"is not able to compile a simple test program.\nIt fails "
+"with the following output:\n ${__CMAKE_Swift_COMPILER_OUTPUT}\n\n"
+"CMake will not be able to correctly generate this project.")
+else()
+  if(Swift_TEST_WAS_RUN)
+PrintTestCompilerStatus("Swift" " -- works")
+file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+  "Determining if the Swift compiler works passed with "
+  "the following output:\n${__CMAKE_Swift_COMPILER_OUTPUT}\n\n")
+  endif()
+endif()
+
+unset(__CMAKE_Swift_COMPILER_OUTPUT)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1aa29f0db614f1292cff24633d61218d82490d1e
commit 1aa29f0db614f1292cff24633d61218d82490d1e
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 18:14:35 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 18:14:35 2015 +0200

Swift: Remove positive Swift language tests

It's relatively complex to determine in advance if a Xcode, SDK,
and Deployment Target configuration is capable of running Swift.

For example the following combinations do not work:
 * deployment target < OS X 10.9
 * Xcode 6.2 and macosx10.9 SDK
 * Xcode 7 Beta 6 and macosx10.10 SDK

Until we found out how to query Xcode for Swift support in a reliable

[Cmake-commits] CMake branch, next, updated. v3.3.1-2775-g5259219

2015-09-06 Thread Gregor Jasny via Cmake-commits

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  5259219860a040eb81f50ea05ee47447d8220b4c (commit)
   via  3b906c8003161f704cc33553f98b57d9dda461b9 (commit)
  from  cfbf38704d2ee4caedf3fff51244855b076a152d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5259219860a040eb81f50ea05ee47447d8220b4c
commit 5259219860a040eb81f50ea05ee47447d8220b4c
Merge: cfbf387 3b906c8
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 14:48:57 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 6 14:48:57 2015 -0400

Merge topic 'fix-xcode-gtk2-tests' into next

3b906c80 GTK2: Add --build-project to all GTK2 tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b906c8003161f704cc33553f98b57d9dda461b9
commit 3b906c8003161f704cc33553f98b57d9dda461b9
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 20:41:41 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 20:41:41 2015 +0200

GTK2: Add --build-project to all GTK2 tests

Otherwise xcodebuild invocation will fail.

diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 1c5987c..0105fae 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -9,6 +9,7 @@ if(GTK2_GTK_FOUND)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
  ${build_generator_args}
 --build-target gtk-all-libs
+--build-project gtk
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V
@@ -22,6 +23,7 @@ if(GTK2_GTKMM_FOUND)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
  ${build_generator_args}
 --build-target gtkmm-all-libs
+--build-project gtkmm
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V
@@ -310,6 +312,7 @@ if(TARGET GTK2::gtkmm)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
  ${build_generator_args}
 --build-target gtkmm-target
+--build-project gtkmm
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V

---

Summary of changes:
 Tests/FindGTK2/CMakeLists.txt |3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2770-g6985b37

2015-09-05 Thread Gregor Jasny via Cmake-commits

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  6985b37195c2b0336f3702cba64fb83d52a7d2b1 (commit)
   via  d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc (commit)
  from  bb946e544e4895670f946c252234c101c37443d0 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6985b37195c2b0336f3702cba64fb83d52a7d2b1
commit 6985b37195c2b0336f3702cba64fb83d52a7d2b1
Merge: bb946e5 d778a1c
Author: Gregor Jasny 
AuthorDate: Sat Sep 5 17:40:49 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Sep 5 17:40:49 2015 -0400

Merge topic 'more-swift2-fixes' into next

d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc
commit d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc
Author: Gregor Jasny 
AuthorDate: Sat Sep 5 23:39:27 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sat Sep 5 23:39:27 2015 +0200

Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 801d7e8..2c6a42c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -213,6 +213,29 @@ if(BUILD_TESTING)
 set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
   endif()
 endif()
+if(CMAKE_OSX_SYSROOT)
+  execute_process(
+COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version ProductName
+OUTPUT_VARIABLE _stdout
+OUTPUT_STRIP_TRAILING_WHITESPACE
+ERROR_VARIABLE _stderr
+RESULT_VARIABLE _failed
+)
+  if(NOT _failed)
+set(CMAKE_OSX_SDKPRODUCT "${_stdout}")
+  endif()
+
+  execute_process(
+COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion
+OUTPUT_VARIABLE _stdout
+OUTPUT_STRIP_TRAILING_WHITESPACE
+ERROR_VARIABLE _stderr
+RESULT_VARIABLE _failed
+)
+  if(NOT _failed)
+set(CMAKE_OSX_SDKVERSION "${_stdout}")
+  endif()
+endif()
   endif()
 
   # Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
@@ -258,10 +281,14 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
   set_tests_properties(MissingSourceFile PROPERTIES
 PASS_REGULAR_EXPRESSION "CMake Error at CMakeLists.txt:3 
\\(add_executable\\):[ \r\n]*Cannot find source file:[ 
\r\n]*DoesNotExist/MissingSourceFile.c")
-  if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 
6.1)
-if(CMAKE_GENERATOR STREQUAL "Xcode")
-  ADD_TEST_MACRO(SwiftMix SwiftMix)
-  ADD_TEST_MACRO(SwiftOnly SwiftOnly)
+  if(CMake_TEST_XCODE_VERSION AND CMAKE_OSX_SDKVERSION AND 
CMAKE_OSX_SDKPRODUCT)
+if((NOT CMake_TEST_XCODE_VERSION VERSION_LESS 6.1) AND
+   ((NOT CMAKE_OSX_SDKPRODUCT STREQUAL "Mac OS X") OR
+(NOT CMAKE_OSX_SDKVERSION VERSION_LESS 10.10)))
+  if(CMAKE_GENERATOR STREQUAL "Xcode")
+ADD_TEST_MACRO(SwiftMix SwiftMix)
+ADD_TEST_MACRO(SwiftOnly SwiftOnly)
+  endif()
 endif()
   endif()
   if(CMAKE_Fortran_COMPILER)

---

Summary of changes:
 Tests/CMakeLists.txt |   35 +++
 1 file changed, 31 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2765-g8be433e

2015-09-03 Thread Gregor Jasny via Cmake-commits

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  8be433e2fbbab9a4b6634246d1b69c2d5fd27380 (commit)
   via  4da60024adfb312883b93e5e3cacd928aa2e79ce (commit)
   via  874a265c94ff17e07a96969c0a7f8f98a66b1074 (commit)
  from  a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8be433e2fbbab9a4b6634246d1b69c2d5fd27380
commit 8be433e2fbbab9a4b6634246d1b69c2d5fd27380
Merge: a9b52ab 4da6002
Author: Gregor Jasny 
AuthorDate: Thu Sep 3 14:31:34 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Sep 3 14:31:34 2015 -0400

Merge topic 'more-swift2-fixes' into next

4da60024 Swift: Fix Compiler-Id detection for Swift 2
874a265c Swift: Make SwiftMix compatible with Swift 2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da60024adfb312883b93e5e3cacd928aa2e79ce
commit 4da60024adfb312883b93e5e3cacd928aa2e79ce
Author: Gregor Jasny 
AuthorDate: Thu Sep 3 15:56:52 2015 +0200
Commit: Gregor Jasny 
CommitDate: Thu Sep 3 20:30:45 2015 +0200

Swift: Fix Compiler-Id detection for Swift 2

diff --git a/Modules/CompilerId/main.swift.in b/Modules/CompilerId/main.swift.in
index 962e857..13f0ba0 100644
--- a/Modules/CompilerId/main.swift.in
+++ b/Modules/CompilerId/main.swift.in
@@ -1 +1 @@
-println("CMakeSwiftCompilerId")
+print("CMakeSwiftCompilerId")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=874a265c94ff17e07a96969c0a7f8f98a66b1074
commit 874a265c94ff17e07a96969c0a7f8f98a66b1074
Author: Gregor Jasny 
AuthorDate: Thu Sep 3 15:26:06 2015 +0200
Commit: Gregor Jasny 
CommitDate: Thu Sep 3 20:30:32 2015 +0200

Swift: Make SwiftMix compatible with Swift 2

diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 7e7c4ab..3629ac8 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -1,8 +1,10 @@
-@objc class SwiftMainClass {
+import Foundation
+
+@objc class SwiftMainClass : NSObject {
   class func SwiftMain(argc:Int, argv:UnsafePointer) -> 
Int32 {
 dump("argc: \(argc)")
 for (var i = 0; i < argc; ++i) {
-  var argi = String.fromCString(argv[i])
+  let argi = String.fromCString(argv[i])
   dump("arg[\(i)]: \(argi)");
 }
 return 0;

---

Summary of changes:
 Modules/CompilerId/main.swift.in |2 +-
 Tests/SwiftMix/SwiftMain.swift   |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2762-ga9b52ab

2015-09-03 Thread Gregor Jasny via Cmake-commits

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  a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2 (commit)
   via  ff052f9ccbb188794c94caec70c266f6d6619da0 (commit)
  from  41523a932cbc67eab2d39e781e5ac095f0d03fdd (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2
commit a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2
Merge: 41523a9 ff052f9
Author: Gregor Jasny 
AuthorDate: Thu Sep 3 14:29:29 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Sep 3 14:29:29 2015 -0400

Merge topic 'apple-no-libnetwork' into next

ff052f9c Do not use libnetwork on Apple platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff052f9ccbb188794c94caec70c266f6d6619da0
commit ff052f9ccbb188794c94caec70c266f6d6619da0
Author: Gregor Jasny 
AuthorDate: Thu Sep 3 13:18:19 2015 +0200
Commit: Gregor Jasny 
CommitDate: Thu Sep 3 20:28:38 2015 +0200

Do not use libnetwork on Apple platforms

Starting with OSX 10.11 there is a library called libnetwork
which will be picked up during curl configuration.
This breaks backward compatibility of the resulting binaries
because libnetwork is not available on older OSX versions.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index d12c73f..f3a99d0 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -347,7 +347,9 @@ if(BEOS)
   check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI)
 endif(BEOS)
 
-check_library_exists_concat("network" recv HAVE_LIBNETWORK)
+if(NOT APPLE)
+  check_library_exists_concat("network" recv HAVE_LIBNETWORK)
+endif(NOT APPLE)
 
 if(NOT NOT_NEED_LIBNSL)
   check_library_exists_concat("nsl"gethostbyname  HAVE_LIBNSL)

---

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2694-gb817975

2015-09-01 Thread Gregor Jasny via Cmake-commits

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  b8179759b8cbeebab8f3655eef0f1c90c84b786f (commit)
   via  61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8 (commit)
  from  8033831b5e3475ea52eaf83ab219615dee2be1df (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8179759b8cbeebab8f3655eef0f1c90c84b786f
commit b8179759b8cbeebab8f3655eef0f1c90c84b786f
Merge: 8033831 61b6d52
Author: Gregor Jasny 
AuthorDate: Tue Sep 1 14:35:16 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 14:35:16 2015 -0400

Merge topic 'swift2-compatibility' into next

61b6d52a Swift: Use dump instead of println


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
commit 61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
Author: Gregor Jasny 
AuthorDate: Tue Sep 1 20:32:38 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Sep 1 20:32:38 2015 +0200

Swift: Use dump instead of println

With Swift 2.0 in Xcode7 the println function was renamed into
print. Use dump function instead which adds newlines like println.

diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 9af9883..7e7c4ab 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -1,9 +1,9 @@
 @objc class SwiftMainClass {
   class func SwiftMain(argc:Int, argv:UnsafePointer) -> 
Int32 {
-println("argc: \(argc)")
+dump("argc: \(argc)")
 for (var i = 0; i < argc; ++i) {
   var argi = String.fromCString(argv[i])
-  println("arg[\(i)]: \(argi)");
+  dump("arg[\(i)]: \(argi)");
 }
 return 0;
   }
diff --git a/Tests/SwiftOnly/main.swift b/Tests/SwiftOnly/main.swift
index 67be986..28560d0 100644
--- a/Tests/SwiftOnly/main.swift
+++ b/Tests/SwiftOnly/main.swift
@@ -1 +1 @@
-println("SwiftOnly")
+dump("SwiftOnly")

---

Summary of changes:
 Tests/SwiftMix/SwiftMain.swift |4 ++--
 Tests/SwiftOnly/main.swift |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2666-g70c864a

2015-08-31 Thread Gregor Jasny via Cmake-commits

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  70c864ae8ffec43956e751a2ab600862b4fdac7d (commit)
   via  ad262917d96aa4d6faeff3c9dfecf684cebbe123 (commit)
   via  48fe617e667d2e6b1e471cfb56346de51f984ba5 (commit)
   via  d2c2319d6479d4319ef298f6178b00e953a9b179 (commit)
  from  b104667b9132bdc13fe42bde140378d579bfb3e6 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70c864ae8ffec43956e751a2ab600862b4fdac7d
commit 70c864ae8ffec43956e751a2ab600862b4fdac7d
Merge: b104667 ad26291
Author: Gregor Jasny 
AuthorDate: Mon Aug 31 15:06:54 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 15:06:54 2015 -0400

Merge topic 'fix-ios-install' into next

ad262917 Xcode: Add unit test for iOS project install (#12506)
48fe617e Fix installation of iOS targets (#12506)
d2c2319d Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to 
PlatformIsAppleIos


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad262917d96aa4d6faeff3c9dfecf684cebbe123
commit ad262917d96aa4d6faeff3c9dfecf684cebbe123
Author: Gregor Jasny 
AuthorDate: Sat Aug 15 22:37:35 2015 +0200
Commit: Gregor Jasny 
CommitDate: Wed Aug 26 20:54:52 2015 +0200

Xcode: Add unit test for iOS project install (#12506)

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index ef81739..382c990 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -11,6 +11,20 @@ endif()
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS 
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeInstallIOS)
+  run_cmake_command(XcodeInstallIOS-install ${CMAKE_COMMAND} --build . 
--target install)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesOSX-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS "-DTEST_IOS=OFF")
diff --git a/Tests/RunCMake/XcodeProject/XcodeInstallIOS-install-stdout.txt 
b/Tests/RunCMake/XcodeProject/XcodeInstallIOS-install-stdout.txt
new file mode 100644
index 000..f2478be
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeInstallIOS-install-stdout.txt
@@ -0,0 +1,2 @@
+-- Install configuration: .*
+-- Installing: .*/ios_install/lib/libfoo.a
diff --git a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake 
b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
new file mode 100644
index 000..a797410
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.8.5)
+
+project(XcodeInstallIOS)
+
+set(CMAKE_OSX_SYSROOT iphoneos)
+set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
+
+set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
+
+add_library(foo STATIC foo.cpp)
+install(TARGETS foo ARCHIVE DESTINATION lib)
diff --git a/Tests/RunCMake/XcodeProject/foo.cpp 
b/Tests/RunCMake/XcodeProject/foo.cpp
new file mode 100644
index 000..2fb55ee
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/foo.cpp
@@ -0,0 +1 @@
+void foo() { }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48fe617e667d2e6b1e471cfb56346de51f984ba5
commit 48fe617e667d2e6b1e471cfb56346de51f984ba5
Author: Gregor Jasny 
AuthorDate: Thu Aug 13 13:03:02 2015 +0300
Commit: Gregor Jasny 
CommitDate: Tue Aug 25 21:53:51 2015 +0200

Fix installation of iOS targets (#12506)

Since cmTarget::ComputeOutputDir results can be used in CMake code of script
cmake_install.cmake and in Xcode internals, string 
${EFFECTIVE_PLATFORM_NAME}
should be used instead of $(EFFECTIVE_PLATFORM_NAME) because it works for 
both.

Value of CMAKE_CFG_INTDIR can't be used in BUILD_TYPE argument of install
command since it contains $(EFFECTIVE_PLATFORM_NAME) (e.g. equals to
`Release-iphoneos`, `Debug-iphoneos`, etc.).

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 503c455..40f1fcf 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2427,7 +2427,17 @@ void

[Cmake-commits] CMake branch, next, updated. v3.3.1-2450-g849ccc5

2015-08-25 Thread Gregor Jasny via Cmake-commits

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  849ccc59e315e64b2c2c98d79ba2108810c461ca (commit)
   via  67f60958b61941264b0e2a63ad527dd346a6b1e3 (commit)
  from  d70e7e1491ec53571d1948c89cf658393ebee406 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=849ccc59e315e64b2c2c98d79ba2108810c461ca
commit 849ccc59e315e64b2c2c98d79ba2108810c461ca
Merge: d70e7e1 67f6095
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Tue Aug 25 15:48:42 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 15:48:42 2015 -0400

Merge topic 'apple-tbd-stubs' into next

67f60958 Darwin: Add support for tbd library stub files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67f60958b61941264b0e2a63ad527dd346a6b1e3
commit 67f60958b61941264b0e2a63ad527dd346a6b1e3
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 15 21:01:31 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Mon Aug 24 22:29:33 2015 +0200

Darwin: Add support for tbd library stub files

Starting with Xcode 7 the OSX and iOS SDKs contain only stub
files for dynamic system libraries. These stub files contain
some meta data and a list of exported sysbols in plain text.

They are handled by the toolchain like regular dylibs.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 4e4810a..bb085ac 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -53,7 +53,7 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS -dynamiclib 
-Wl,-headerpad_max_install_
 set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS -bundle 
-Wl,-headerpad_max_install_names)
 set(CMAKE_SHARED_MODULE_LOADER_C_FLAG -Wl,-bundle_loader,)
 set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG -Wl,-bundle_loader,)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
+set(CMAKE_FIND_LIBRARY_SUFFIXES .tbd .dylib .so .a)
 
 # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old 
build tree
 # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL 
isn't in the cache
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index ef81739..1151abf 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -39,3 +39,9 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
   unset(RunCMake_TEST_NO_CLEAN)
   unset(RunCMake_TEST_OPTIONS)
 endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7)
+  set(RunCMake_TEST_OPTIONS 
-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake)
+  run_cmake(XcodeTbdStub)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt 
b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
new file mode 100644
index 000..9d9e143
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
@@ -0,0 +1 @@
+.*/libz\.tbd.*
diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake 
b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
new file mode 100644
index 000..e83d7f3
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
@@ -0,0 +1,2 @@
+cmake_minimum_required(VERSION 3.3)
+find_package(ZLIB REQUIRED)
diff --git a/Tests/RunCMake/XcodeProject/osx.cmake 
b/Tests/RunCMake/XcodeProject/osx.cmake
new file mode 100644
index 000..e021fcd
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/osx.cmake
@@ -0,0 +1,18 @@
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_VERSION 1)
+set(UNIX True)
+set(APPLE True)
+
+find_program(XCRUN_EXECUTABLE xcrun)
+if(NOT XCRUN_EXECUTABLE)
+  message(FATAL_ERROR xcrun not found)
+endif()
+
+execute_process(
+  COMMAND ${XCRUN_EXECUTABLE} --sdk macosx --show-sdk-path
+  OUTPUT_VARIABLE OSX_SDK_PATH
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(CMAKE_OSX_SYSROOT ${OSX_SDK_PATH} CACHE PATH Sysroot used for OSX 
support)
+
+set(CMAKE_FIND_ROOT_PATH ${OSX_SDK_PATH} CACHE PATH Find search path root)

---

Summary of changes:
 Modules/Platform/Darwin.cmake   |2 +-
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake  |6 ++
 Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt |1 +
 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake  |2 ++
 Tests/RunCMake/XcodeProject/osx.cmake   |   18 ++
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
 create mode 100644

[Cmake-commits] CMake branch, next, updated. v3.3.1-2325-gc12be0d

2015-08-22 Thread Gregor Jasny via Cmake-commits

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  c12be0dce8d045b3759296f5ce0607e80820f27d (commit)
   via  d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3 (commit)
  from  c660fc32242906a361ca99c513465278bcc0fe97 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c12be0dce8d045b3759296f5ce0607e80820f27d
commit c12be0dce8d045b3759296f5ce0607e80820f27d
Merge: c660fc3 d4ab0eb
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 22 04:31:18 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Aug 22 04:31:18 2015 -0400

Merge topic 'ios-app-bundle-layout' into next

d4ab0ebf fixup! fixup! Fix iOS Bundle layouts (#15669)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3
commit d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 22 10:30:39 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Sat Aug 22 10:30:39 2015 +0200

fixup! fixup! Fix iOS Bundle layouts (#15669)

diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake 
b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index daf230a..d5cb51f 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -8,6 +8,7 @@ if(TEST_IOS)
   set(CMAKE_OSX_ARCHITECTURES armv7)
   set(CMAKE_XCODE_EFFECTIVE_PLATFORMS -iphoneos;-iphonesimulator)
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO)
 endif(TEST_IOS)
 
 # App Bundle
@@ -20,16 +21,18 @@ add_custom_target(AppBundleTest ALL
 
 add_dependencies(AppBundleTest AppBundle)
 
-# Framework
+# Framework (not supported for iOS on Xcode  6)
 
-add_library(Framework SHARED main.c)
-set_target_properties(Framework PROPERTIES FRAMEWORK TRUE)
+if(NOT TEST_IOS OR NOT XCODE_VERSION VERSION_LESS 6)
+  add_library(Framework SHARED main.c)
+  set_target_properties(Framework PROPERTIES FRAMEWORK TRUE)
 
-add_custom_target(FrameworkTest ALL
-  COMMAND ${CMAKE_COMMAND} -E copy
-$TARGET_FILE:Framework $TARGET_FILE:Framework.old)
+  add_custom_target(FrameworkTest ALL
+COMMAND ${CMAKE_COMMAND} -E copy
+  $TARGET_FILE:Framework $TARGET_FILE:Framework.old)
 
-add_dependencies(FrameworkTest Framework)
+  add_dependencies(FrameworkTest Framework)
+endif()
 
 # Bundle
 

---

Summary of changes:
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.1-2319-g524481c

2015-08-21 Thread Gregor Jasny via Cmake-commits

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  524481c809df3cb7b962af97ba1c9078dc5884c3 (commit)
   via  6819c083c3617d2a255c728fc0564306bdd15631 (commit)
  from  73b5206f39e5e85314184ddc7c1f84a9b3dd7999 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524481c809df3cb7b962af97ba1c9078dc5884c3
commit 524481c809df3cb7b962af97ba1c9078dc5884c3
Merge: 73b5206 6819c08
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Fri Aug 21 14:00:26 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 21 14:00:26 2015 -0400

Merge topic 'ios-app-bundle-layout' into next

6819c083 fixup! Fix iOS Bundle layouts (#15669)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6819c083c3617d2a255c728fc0564306bdd15631
commit 6819c083c3617d2a255c728fc0564306bdd15631
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Fri Aug 21 19:59:08 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Fri Aug 21 19:59:08 2015 +0200

fixup! Fix iOS Bundle layouts (#15669)

diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake 
b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index fdb5f11..daf230a 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -5,7 +5,7 @@ enable_language(C)
 
 if(TEST_IOS)
   set(CMAKE_OSX_SYSROOT iphoneos)
-  #set(CMAKE_OSX_ARCHITECTURES i386)
+  set(CMAKE_OSX_ARCHITECTURES armv7)
   set(CMAKE_XCODE_EFFECTIVE_PLATFORMS -iphoneos;-iphonesimulator)
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
 endif(TEST_IOS)

---

Summary of changes:
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.0-1895-gc06c74f

2015-08-04 Thread Gregor Jasny via Cmake-commits

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  c06c74f32f5318789bd72ddb41cec9759d6a9339 (commit)
   via  adecd54b8a3e357489c2492898a5594217e4db29 (commit)
   via  c635339b0039d677100f7212ed02d8f0dc3f492d (commit)
  from  e12067e28975b01aca849ee1d55656d3ba23c694 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c06c74f32f5318789bd72ddb41cec9759d6a9339
commit c06c74f32f5318789bd72ddb41cec9759d6a9339
Merge: e12067e adecd54
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Tue Aug 4 16:47:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 4 16:47:05 2015 -0400

Merge topic 'fix-xcode-quoting' into next

adecd54b Xcode: Invert quoting logic to whitelist of characters
c635339b Xcode: quote more characters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adecd54b8a3e357489c2492898a5594217e4db29
commit adecd54b8a3e357489c2492898a5594217e4db29
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sun Aug 2 00:06:49 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Sun Aug 2 00:16:39 2015 +0200

Xcode: Invert quoting logic to whitelist of characters

The problem with the list of characters which triggers quoting
is that it does not with UTF-8 characters which are not in the
7 bit table. Therefore the quoting decision is reversed:

Do not quote if all characters found in the string are in the
whitelist.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 4041d26..c59c360 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,11 @@ void cmXCodeObject::PrintString(std::ostream 
os,std::string String)
   bool needQuote =
 (String.empty() ||
  String.find(//) != String.npos ||
- String.find_first_of( +-*=@[](){},~|;!?':#%^\\\`) != String.npos);
+ String.find_first_not_of(
+   ABCDEFGHIJKLMNOPQRSTUVWXYZ
+   abcdefghijklmnopqrstuvwxyz
+   0123456789
+   $_./) != String.npos);
   const char* quote = needQuote? \ : ;
 
   // Print the string, quoted and escaped as necessary.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c635339b0039d677100f7212ed02d8f0dc3f492d
commit c635339b0039d677100f7212ed02d8f0dc3f492d
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 1 22:30:15 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Sun Aug 2 00:16:31 2015 +0200

Xcode: quote more characters

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index ba6e395..4041d26 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream 
os,std::string String)
   bool needQuote =
 (String.empty() ||
  String.find(//) != String.npos ||
- String.find_first_of( +-*=@[](){},~) != String.npos);
+ String.find_first_of( +-*=@[](){},~|;!?':#%^\\\`) != String.npos);
   const char* quote = needQuote? \ : ;
 
   // Print the string, quoted and escaped as necessary.

---

Summary of changes:
 Source/cmXCodeObject.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.3.0-1577-g45a48d7

2015-07-31 Thread Gregor Jasny via Cmake-commits

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  45a48d7e23bae2590516118643d592f02f69ff4e (commit)
   via  da0480be5d8d03c5c5c4f14fbc4e1dcfed532620 (commit)
   via  1687060b587ded9e65153280c8ab364b05614b64 (commit)
  from  d42ee02881817f90451a6fdb0f983ab5fd56a3e5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45a48d7e23bae2590516118643d592f02f69ff4e
commit 45a48d7e23bae2590516118643d592f02f69ff4e
Merge: d42ee02 da0480b
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Fri Jul 31 07:55:18 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 31 07:55:18 2015 -0400

Merge topic 'fix-xcode-quoting' into next

da0480be Xcode: Properly quote strings containing a tilde
1687060b CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
commit da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Fri Jul 31 13:41:15 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Fri Jul 31 13:46:39 2015 +0200

Xcode: Properly quote strings containing a tilde

During CMake 3.3 development a patch landed in CMake which
made the CMake Xcode generator produce project files just
like Xcode does. Xcode does not quote strings containing a
period. That's why CMake stopped quoting those, too. But
Xcode needs quoting for string with a tilde like
icon29x29~ipad.png which were covered before due to
the containing period.

This fixes CMake bug #15672.

diff --git a/Help/release/dev/fix-xcode-quoting.rst 
b/Help/release/dev/fix-xcode-quoting.rst
new file mode 100644
index 000..33c47cc
--- /dev/null
+++ b/Help/release/dev/fix-xcode-quoting.rst
@@ -0,0 +1,10 @@
+fix-xcode-quoting
+-
+
+* During CMake 3.3 development a patch landed in CMake which made the
+  CMake Xcode generator produce project files just like Xcode does.
+  Xcode does not quote strings containing a period. That's why CMake
+  stopped quoting those, too. But Xcode needs quoting for string with
+  a tilde like ``icon29x29~ipad.png`` which were covered before due to
+  the containing period. CMake now properly quotes strings containing
+  a tilde.
\ No newline at end of file
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index e72d315..ba6e395 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream 
os,std::string String)
   bool needQuote =
 (String.empty() ||
  String.find(//) != String.npos ||
- String.find_first_of( +-*=@[](){},) != String.npos);
+ String.find_first_of( +-*=@[](){},~) != String.npos);
   const char* quote = needQuote? \ : ;
 
   // Print the string, quoted and escaped as necessary.

---

Summary of changes:
 Help/release/dev/fix-xcode-quoting.rst |   10 ++
 Source/CMakeVersion.cmake  |2 +-
 Source/cmXCodeObject.cxx   |2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/fix-xcode-quoting.rst


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

62 matches

Mail list logo