[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-1196-g20a2a98

2015-10-30 Thread Brad King 
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  20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (commit)
   via  31e6571cca3267cf1f5e17df7c985521211885ef (commit)
  from  2a94c83c8babd8c42001d593dbafe6faaf291938 (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=20a2a98d7b2f61dd3ac74b7073a15ca84efb517d
commit 20a2a98d7b2f61dd3ac74b7073a15ca84efb517d
Merge: 2a94c83 31e6571
Author: Brad King 
AuthorDate: Fri Oct 30 07:41:38 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 30 07:41:38 2015 -0400

Merge topic 'fix-find_program-regression' into next

31e6571c find_program: Fix regression in finding an already-known path


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31e6571cca3267cf1f5e17df7c985521211885ef
commit 31e6571cca3267cf1f5e17df7c985521211885ef
Author: Brad King 
AuthorDate: Thu Oct 29 17:50:19 2015 -0400
Commit: Brad King 
CommitDate: Fri Oct 30 07:40:46 2015 -0400

find_program: Fix regression in finding an already-known path

Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement
search using more flexible approach, 2015-09-01) did not preserve the
behavior of looking for the given name with no search path at all.
Fix this and add a test case covering finding an absolute path with
no search directories.

diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index e64ed87..219ad48 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -176,6 +176,13 @@ std::string 
cmFindProgramCommand::FindNormalProgramNamesPerDir()
 {
 helper.AddName(*ni);
 }
+
+  // Check for the names themselves (e.g. absolute paths).
+  if (helper.CheckDirectory(std::string()))
+{
+return helper.BestPath;
+}
+
   // Search every directory.
   for (std::vector::const_iterator
  p = this->SearchPaths.begin(); p != this->SearchPaths.end(); ++p)
@@ -200,6 +207,12 @@ std::string 
cmFindProgramCommand::FindNormalProgramDirsPerName()
 // Switch to searching for this name.
 helper.SetName(*ni);
 
+// Check for the name by itself (e.g. an absolute path).
+if (helper.CheckDirectory(std::string()))
+  {
+  return helper.BestPath;
+  }
+
 // Search every directory.
 for (std::vector::const_iterator
p = this->SearchPaths.begin();
diff --git a/Tests/RunCMake/find_program/DirsPerName-stdout.txt 
b/Tests/RunCMake/find_program/DirsPerName-stdout.txt
index f763bb0..dc1c82b 100644
--- a/Tests/RunCMake/find_program/DirsPerName-stdout.txt
+++ b/Tests/RunCMake/find_program/DirsPerName-stdout.txt
@@ -1 +1,2 @@
 -- PROG='[^']*/Tests/RunCMake/find_program/B/testB'
+-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'
diff --git a/Tests/RunCMake/find_program/DirsPerName.cmake 
b/Tests/RunCMake/find_program/DirsPerName.cmake
index 54db6dd..6db778d 100644
--- a/Tests/RunCMake/find_program/DirsPerName.cmake
+++ b/Tests/RunCMake/find_program/DirsPerName.cmake
@@ -4,3 +4,9 @@ find_program(PROG
   NO_DEFAULT_PATH
   )
 message(STATUS "PROG='${PROG}'")
+
+find_program(PROG_ABS
+  NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA
+  NO_DEFAULT_PATH
+  )
+message(STATUS "PROG_ABS='${PROG_ABS}'")
diff --git a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt 
b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
index 964e259..fd79185 100644
--- a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
+++ b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
@@ -1 +1,2 @@
 -- PROG='[^']*/Tests/RunCMake/find_program/A/testA'
+-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'
diff --git a/Tests/RunCMake/find_program/NamesPerDir.cmake 
b/Tests/RunCMake/find_program/NamesPerDir.cmake
index 49ce49d..5f00a28 100644
--- a/Tests/RunCMake/find_program/NamesPerDir.cmake
+++ b/Tests/RunCMake/find_program/NamesPerDir.cmake
@@ -4,3 +4,9 @@ find_program(PROG
   NO_DEFAULT_PATH
   )
 message(STATUS "PROG='${PROG}'")
+
+find_program(PROG_ABS
+  NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA NAMES_PER_DIR
+  NO_DEFAULT_PATH
+  )
+message(STATUS "PROG_ABS='${PROG_ABS}'")

---

Summary of changes:
 Source/cmFindProgramCommand.cxx|   13 +
 Tests/RunCMake/find_program/DirsPerName-stdout.txt |1 +
 Tests/RunCMake/find_program/DirsPerName.cmake  |6 ++
 Tests/RunCMake/find_program/NamesPerDir-stdout.txt |1 +
 Tests/RunCMake/find_program/NamesPerDir.cmake  |6

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1198-g31e92e6

2015-10-30 Thread Brad King 
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  31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (commit)
   via  9a7f042a955e814f66b8e468f934852ed53e0376 (commit)
  from  20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (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=31e92e6ea1fae6e3d360dbe49edf032f4efa4523
commit 31e92e6ea1fae6e3d360dbe49edf032f4efa4523
Merge: 20a2a98 9a7f042
Author: Brad King 
AuthorDate: Fri Oct 30 09:10:03 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 30 09:10:03 2015 -0400

Merge topic 'doc-apple-info-plist-properties' into next

9a7f042a Help: Document target properties setting Info.plist fields (#15820)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a7f042a955e814f66b8e468f934852ed53e0376
commit 9a7f042a955e814f66b8e468f934852ed53e0376
Author: Brad King 
AuthorDate: Fri Oct 30 09:04:52 2015 -0400
Commit: Brad King 
CommitDate: Fri Oct 30 09:09:40 2015 -0400

Help: Document target properties setting Info.plist fields (#15820)

Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and
specify for each property what field in the Info.plist file it sets.

diff --git a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst 
b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
index 097cce1..07a933f 100644
--- a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
@@ -1,29 +1,35 @@
 MACOSX_BUNDLE_INFO_PLIST
 
 
-Specify a custom Info.plist template for a Mac OS X App Bundle.
+Specify a custom ``Info.plist`` template for a Mac OS X App Bundle.
 
-An executable target with MACOSX_BUNDLE enabled will be built as an
-application bundle on Mac OS X.  By default its Info.plist file is
-created by configuring a template called MacOSXBundleInfo.plist.in
-located in the CMAKE_MODULE_PATH.  This property specifies an
-alternative template file name which may be a full path.
+An executable target with :prop_tgt:`MACOSX_BUNDLE` enabled will be built as an
+application bundle on Mac OS X.  By default its ``Info.plist`` file is created
+by configuring a template called ``MacOSXBundleInfo.plist.in`` located in the
+:variable:`CMAKE_MODULE_PATH`.  This property specifies an alternative template
+file name which may be a full path.
 
 The following target properties may be set to specify content to be
 configured into the file:
 
-::
-
-  MACOSX_BUNDLE_INFO_STRING
-  MACOSX_BUNDLE_ICON_FILE
-  MACOSX_BUNDLE_GUI_IDENTIFIER
-  MACOSX_BUNDLE_LONG_VERSION_STRING
-  MACOSX_BUNDLE_BUNDLE_NAME
-  MACOSX_BUNDLE_SHORT_VERSION_STRING
-  MACOSX_BUNDLE_BUNDLE_VERSION
-  MACOSX_BUNDLE_COPYRIGHT
+``MACOSX_BUNDLE_BUNDLE_NAME``
+  Sets ``CFBundleName``.
+``MACOSX_BUNDLE_BUNDLE_VERSION``
+  Sets ``CFBundleVersion``.
+``MACOSX_BUNDLE_COPYRIGHT``
+  Sets ``NSHumanReadableCopyright``.
+``MACOSX_BUNDLE_GUI_IDENTIFIER``
+  Sets ``CFBundleIdentifier``.
+``MACOSX_BUNDLE_ICON_FILE``
+  Sets ``CFBundleIconFile``.
+``MACOSX_BUNDLE_INFO_STRING``
+  Sets ``CFBundleGetInfoString``.
+``MACOSX_BUNDLE_LONG_VERSION_STRING``
+  Sets ``CFBundleLongVersionString``.
+``MACOSX_BUNDLE_SHORT_VERSION_STRING``
+  Sets ``CFBundleShortVersionString``.
 
 CMake variables of the same name may be set to affect all targets in a
 directory that do not have each specific property set.  If a custom
-Info.plist is specified by this property it may of course hard-code
+``Info.plist`` is specified by this property it may of course hard-code
 all the settings instead of using the target properties.
diff --git a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst 
b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
index 729d929..548c3ac 100644
--- a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
@@ -1,25 +1,27 @@
 MACOSX_FRAMEWORK_INFO_PLIST
 ---
 
-Specify a custom Info.plist template for a Mac OS X Framework.
+Specify a custom ``Info.plist`` template for a Mac OS X Framework.
 
-A library target with FRAMEWORK enabled will be built as a framework
-on Mac OS X.  By default its Info.plist file is created by configuring
-a template called MacOSXFrameworkInfo.plist.in located in the
-CMAKE_MODULE_PATH.  This property specifies an alternative template
+A library target with :prop_tgt:`FRAMEWORK` enabled will be built as a
+framework on Mac OS X.  By default its ``Info.plist`` file is created by
+configuring a template called ``MacOSXFrameworkInfo.plist.in`` located in the