[Cmake-commits] CMake branch, next, updated. v3.3.1-2654-gcf3138b

2015-08-31 Thread Chuck Atkins
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  cf3138b2ec9150f33bf1fc9c5893a3b8135f8605 (commit)
   via  586a95d01184aa2300a3a32572c688cbf648106c (commit)
  from  8a72b18cb37592bd896d12570cbe82787b9cdc74 (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=cf3138b2ec9150f33bf1fc9c5893a3b8135f8605
commit cf3138b2ec9150f33bf1fc9c5893a3b8135f8605
Merge: 8a72b18 586a95d
Author: Chuck Atkins 
AuthorDate: Mon Aug 31 11:20:37 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 11:20:37 2015 -0400

Merge topic 'fix-link-search-start-logic' into next

586a95d0 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586a95d01184aa2300a3a32572c688cbf648106c
commit 586a95d01184aa2300a3a32572c688cbf648106c
Author: Chuck Atkins 
AuthorDate: Sun Aug 30 17:44:01 2015 -0400
Commit: Chuck Atkins 
CommitDate: Mon Aug 31 11:14:38 2015 -0400

cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC

In commit 675ef165, a bug was introduced that treated the
LINK_SEARCH_START_STATIC and LINK_SEARCH_END_STATIC as ternary
properties instead of boolean.  This reverts those changes back to the
previous behavior in cmComputeLinkInformation.

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index 4b70e5e..0269db9 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -522,10 +522,9 @@ bool cmComputeLinkInformation::Compute()
   // libraries are found.
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
-  if(lss)
+  if(cmSystemTools::IsOn(lss))
 {
-this->SetCurrentLinkType(
-  cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared);
+this->SetCurrentLinkType(LinkStatic);
 }
   else
 {
@@ -863,8 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
   this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
-  this->CurrentLinkType = LinkUnknown;
-  this->SetCurrentLinkType(this->StartLinkType);
+  this->CurrentLinkType = this->StartLinkType);
 }
 
 //

---

Summary of changes:


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-2656-g203306c

2015-08-31 Thread Chuck Atkins
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  203306cfc18d29686c6f6742d7960356c044438d (commit)
   via  9746b09d4eac6252e4edca12b204284367af8c93 (commit)
  from  cf3138b2ec9150f33bf1fc9c5893a3b8135f8605 (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=203306cfc18d29686c6f6742d7960356c044438d
commit 203306cfc18d29686c6f6742d7960356c044438d
Merge: cf3138b 9746b09
Author: Chuck Atkins 
AuthorDate: Mon Aug 31 11:22:25 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 11:22:25 2015 -0400

Merge topic 'fix-link-search-start-logic' into next

9746b09d cmComputeLinkInformation: Fix build error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9746b09d4eac6252e4edca12b204284367af8c93
commit 9746b09d4eac6252e4edca12b204284367af8c93
Author: Chuck Atkins 
AuthorDate: Mon Aug 31 11:21:57 2015 -0400
Commit: Chuck Atkins 
CommitDate: Mon Aug 31 11:21:57 2015 -0400

cmComputeLinkInformation: Fix build error

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index 0269db9..d35b566 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -862,7 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
   this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
-  this->CurrentLinkType = this->StartLinkType);
+  this->CurrentLinkType = this->StartLinkType;
 }
 
 //

---

Summary of changes:
 Source/cmComputeLinkInformation.cxx |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.1-2658-g71dd6bf

2015-08-31 Thread Chuck Atkins
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  71dd6bfbbdcc4a91322ae233021c91d6899c2691 (commit)
   via  f3eb5815cc507f0bd07db36c57dda10033db1436 (commit)
  from  203306cfc18d29686c6f6742d7960356c044438d (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=71dd6bfbbdcc4a91322ae233021c91d6899c2691
commit 71dd6bfbbdcc4a91322ae233021c91d6899c2691
Merge: 203306c f3eb581
Author: Chuck Atkins 
AuthorDate: Mon Aug 31 11:22:50 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 11:22:50 2015 -0400

Merge topic 'fix-link-search-start-logic' into next

f3eb5815 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3eb5815cc507f0bd07db36c57dda10033db1436
commit f3eb5815cc507f0bd07db36c57dda10033db1436
Author: Chuck Atkins 
AuthorDate: Sun Aug 30 17:44:01 2015 -0400
Commit: Chuck Atkins 
CommitDate: Mon Aug 31 11:22:36 2015 -0400

cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC

In commit 675ef165, a bug was introduced that treated the
LINK_SEARCH_START_STATIC and LINK_SEARCH_END_STATIC as ternary
properties instead of boolean.  This reverts those changes back to the
previous behavior in cmComputeLinkInformation.

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index 4b70e5e..d35b566 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -522,10 +522,9 @@ bool cmComputeLinkInformation::Compute()
   // libraries are found.
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
-  if(lss)
+  if(cmSystemTools::IsOn(lss))
 {
-this->SetCurrentLinkType(
-  cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared);
+this->SetCurrentLinkType(LinkStatic);
 }
   else
 {
@@ -863,8 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
   this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
-  this->CurrentLinkType = LinkUnknown;
-  this->SetCurrentLinkType(this->StartLinkType);
+  this->CurrentLinkType = this->StartLinkType;
 }
 
 //

---

Summary of changes:


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-2660-g5ce9fe1

2015-08-31 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  5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893 (commit)
   via  9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (commit)
  from  71dd6bfbbdcc4a91322ae233021c91d6899c2691 (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=5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893
commit 5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893
Merge: 71dd6bf 9e21b01
Author: Brad King 
AuthorDate: Mon Aug 31 13:10:03 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 13:10:03 2015 -0400

Merge topic 'add-link-search-static-properties-defaults' into next

9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e21b01a4d4781cdcfb8990bdf72a11c83da3887
commit 9e21b01a4d4781cdcfb8990bdf72a11c83da3887
Author: Brad King 
AuthorDate: Fri Aug 28 11:45:45 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 13:08:53 2015 -0400

Revert LINK_SEARCH_{START,END}_STATIC behavior change

The changes to cmComputeLinkInformation.cxx in commit 675ef165 (Allow
LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07)
are unrelated to the feature added by that change and are incorrect.
They lead to cases of extra -Bdynamic flags.  Revert them.

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index 122..c16472e 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -522,10 +522,9 @@ bool cmComputeLinkInformation::Compute()
   // libraries are found.
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
-  if(lss)
+  if(cmSystemTools::IsOn(lss))
 {
-this->SetCurrentLinkType(
-  cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared);
+this->SetCurrentLinkType(LinkStatic);
 }
   else
 {
@@ -863,8 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* lss =
   this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
   this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
-  this->CurrentLinkType = LinkUnknown;
-  this->SetCurrentLinkType(this->StartLinkType);
+  this->CurrentLinkType = this->StartLinkType;
 }
 
 //

---

Summary of changes:


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-2662-gb104667

2015-08-31 Thread Zack Galbreath
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  b104667b9132bdc13fe42bde140378d579bfb3e6 (commit)
   via  8dc7f6c425ebdf1db8280e3b5f64a52729db64da (commit)
  from  5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893 (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=b104667b9132bdc13fe42bde140378d579bfb3e6
commit b104667b9132bdc13fe42bde140378d579bfb3e6
Merge: 5ce9fe1 8dc7f6c
Author: Zack Galbreath 
AuthorDate: Mon Aug 31 14:58:27 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 14:58:27 2015 -0400

Merge topic 'jacoco_find_files' into next

8dc7f6c4 Make Jacoco parser better at finding source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc7f6c425ebdf1db8280e3b5f64a52729db64da
commit 8dc7f6c425ebdf1db8280e3b5f64a52729db64da
Author: Zack Galbreath 
AuthorDate: Fri Aug 28 13:35:47 2015 -0400
Commit: Zack Galbreath 
CommitDate: Fri Aug 28 13:38:26 2015 -0400

Make Jacoco parser better at finding source files

Instead of searching for source files in a couple hard-coded
locations, we now search the source and binary directory for files
matching both the name of the covered file and its package
directory structure.

diff --git a/Source/CTest/cmParseJacocoCoverage.cxx 
b/Source/CTest/cmParseJacocoCoverage.cxx
index 31ad9fe..47e3b32 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -15,11 +15,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
 XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
   : CTest(ctest), Coverage(cont)
   {
+  this->FilePath = "";
+  this->PackagePath = "";
   this->PackageName = "";
-  this->ModuleName = "";
-  this->FileName = "";
-  this->CurFileName = "";
-  this->FilePaths.push_back(this->Coverage.SourceDir);
   }
 
 virtual ~XMLParser()
@@ -38,58 +36,46 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
   if(name == "package")
 {
 this->PackageName = atts[1];
-std::string FilePath = this->Coverage.SourceDir +
-  "/" + this->ModuleName + "/src/main/java/" +
-  this->PackageName;
-this->FilePaths.push_back(FilePath);
-FilePath = this->Coverage.SourceDir +
- "/src/main/java/" + this->PackageName;
-this->FilePaths.push_back(FilePath);
+this->PackagePath = "";
 }
   else if(name == "sourcefile")
 {
-this->FileName = atts[1];
-cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-  "Reading file: " << this->FileName << std::endl,
-  this->Coverage.Quiet);
-  for(size_t i=0;i < FilePaths.size();i++)
-{
-std::string finalpath = FilePaths[i] + "/" + this->FileName;
-if(cmSystemTools::FileExists(finalpath.c_str()))
-  {
-  this->CurFileName = finalpath;
-  break;
-  }
-}
-  cmsys::ifstream fin(this->CurFileName.c_str());
-  if(this->CurFileName == "" || !fin )
+std::string fileName = atts[1];
+
+if (this->PackagePath == "")
   {
-this->CurFileName = this->Coverage.BinaryDir + "/" +
-   this->FileName;
-fin.open(this->CurFileName.c_str());
-if (!fin)
+  if(!this->FindPackagePath(fileName))
 {
-  cmCTestLog(this->CTest, ERROR_MESSAGE,
- "Jacoco Coverage: Error opening " << this->CurFileName
- << std::endl);
-  this->Coverage.Error++;
+cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
+  << this->PackageName << "/" << fileName << std::endl);
+this->Coverage.Error++;
+return;
 }
   }
-  std::string line;
-  FileLinesType& curFileLines =
-this->Coverage.TotalCoverage[this->CurFileName];
-  if(fin)
-{
-curFileLines.push_back(-1);
-}
-  while(cmSystemTools::GetLineFromStream(fin, line))
+
+cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  "Reading file: " << fileName << std::endl,
+  this->Coverage.Quiet);
+
+this->FilePath = this->PackagePath + "/" + fileName;
+cmsys::ifstream fin(this->FilePath.c_str());
+if (!fin)
   {
-

[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-2668-g1bc2c6d

2015-08-31 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  1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13 (commit)
   via  f4b633a3612d290d6986bbfc56ff2d69807a134b (commit)
  from  70c864ae8ffec43956e751a2ab600862b4fdac7d (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=1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13
commit 1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13
Merge: 70c864a f4b633a
Author: Brad King 
AuthorDate: Mon Aug 31 16:25:49 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 16:25:49 2015 -0400

Merge topic 'release-scripts-osx-doc-dir' into next

f4b633a3 Utilities/Release: Install docs in unversioned dir on OS X (#15692)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b633a3612d290d6986bbfc56ff2d69807a134b
commit f4b633a3612d290d6986bbfc56ff2d69807a134b
Author: Brad King 
AuthorDate: Mon Aug 31 16:22:46 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 16:24:38 2015 -0400

Utilities/Release: Install docs in unversioned dir on OS X (#15692)

The CMake.app directory will never overlap with another version of CMake
so we do not need to have a version number on the documentation
directory.  Configure our release binaries on OS X to place the
documentation in an unversioned directory under CMake.app so that
one can always use a path like

 /Applications/CMake.app/Contents/doc/cmake/html/index.html

to visit the documentation even after updating CMake.

diff --git a/Utilities/Release/dashmacmini2_release.cmake 
b/Utilities/Release/dashmacmini2_release.cmake
index 01f5b8b..2802e47 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -9,6 +9,7 @@ set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
 CMAKE_USE_OPENSSL:BOOL=ON
 
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
diff --git a/Utilities/Release/dashmacmini5_release.cmake 
b/Utilities/Release/dashmacmini5_release.cmake
index be1dfa9..0278f28 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -14,6 +14,7 @@ 
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcry
 OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE

---

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |1 +
 Utilities/Release/dashmacmini5_release.cmake |1 +
 2 files 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.3.1-2670-gb53baca

2015-08-31 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  b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94 (commit)
   via  e0cf77b3109e74cbc4c050e9907dacc9f0f40f70 (commit)
  from  1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13 (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=b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94
commit b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94
Merge: 1bc2c6d e0cf77b
Author: Brad King 
AuthorDate: Mon Aug 31 16:37:44 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 16:37:44 2015 -0400

Merge topic 'vs-store-phone-cert-thumbs' into next

e0cf77b3 cmSystemTools: Use CreateFileW explicitly to pass wchar_t path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0cf77b3109e74cbc4c050e9907dacc9f0f40f70
commit e0cf77b3109e74cbc4c050e9907dacc9f0f40f70
Author: Brad King 
AuthorDate: Mon Aug 31 16:32:17 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 16:33:46 2015 -0400

cmSystemTools: Use CreateFileW explicitly to pass wchar_t path

The call to CreateFile added by commit ac0bb433 (VS: Windows Store/Phone
package cert thumbprint, 2015-08-21) passes a wide character path
explicitly so we should call CreateFileW directly.  Otherwise it does
not build without -DUNICODE (e.g. in bootstrap on MSYS).

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 583e1d0..0cbe15c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1025,13 +1025,14 @@ std::string cmSystemTools::ComputeCertificateThumbprint(
   HCERTSTORE certStore = NULL;
   PCCERT_CONTEXT certContext = NULL;
 
-  HANDLE certFile = CreateFile(cmsys::Encoding::ToWide(source.c_str()).c_str(),
-GENERIC_READ,
-FILE_SHARE_READ,
-NULL,
-OPEN_EXISTING,
-FILE_ATTRIBUTE_NORMAL,
-NULL);
+  HANDLE certFile =
+CreateFileW(cmsys::Encoding::ToWide(source.c_str()).c_str(),
+GENERIC_READ,
+FILE_SHARE_READ,
+NULL,
+OPEN_EXISTING,
+FILE_ATTRIBUTE_NORMAL,
+NULL);
 
   if (certFile != INVALID_HANDLE_VALUE && certFile != NULL)
 {

---

Summary of changes:
 Source/cmSystemTools.cxx |   15 ---
 1 file changed, 8 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, master, updated. v3.3.1-1046-g02ab8e3

2015-08-31 Thread Kitware Robot
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  02ab8e30c1a8617616669cb67022b7fc1f84647d (commit)
  from  51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (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=02ab8e30c1a8617616669cb67022b7fc1f84647d
commit 02ab8e30c1a8617616669cb67022b7fc1f84647d
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Tue Sep 1 00:01:04 2015 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Sep 1 00:01:04 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 33ad704..f7d1ba6 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 3)
-set(CMake_VERSION_PATCH 20150831)
+set(CMake_VERSION_PATCH 20150901)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.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.1-2647-gcb09b3a

2015-08-31 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  cb09b3a0ea2bacd67523ebd85af6890b674caea8 (commit)
   via  76fa8596997da889349b759990ea93dcd4c34c8f (commit)
  from  2af56500e8be3074ebb58060909d070b2557e17a (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=cb09b3a0ea2bacd67523ebd85af6890b674caea8
commit cb09b3a0ea2bacd67523ebd85af6890b674caea8
Merge: 2af5650 76fa859
Author: Brad King 
AuthorDate: Mon Aug 31 09:50:25 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:50:25 2015 -0400

Merge topic 'drop-cmsys-std-layer' into next

76fa8596 Tests: Remove use of include  and 
kwsys_{ios,stl}::


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76fa8596997da889349b759990ea93dcd4c34c8f
commit 76fa8596997da889349b759990ea93dcd4c34c8f
Author: Brad King 
AuthorDate: Fri Aug 28 15:07:00 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 09:50:12 2015 -0400

Tests: Remove use of include  and kwsys_{ios,stl}::

We no longer need this compatibility layer for the compilers we support.

diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 309302e..bc4b03e 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -3,15 +3,15 @@
 #include 
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
 // Implement the ABI used by plugins.
 extern "C" int example_exe_function()
 {
-  kwsys_ios::cout << "hello" << kwsys_ios::endl;
+  std::cout << "hello" << std::endl;
   return 123;
 }
 
@@ -23,7 +23,7 @@ extern "C" int example_exe_function()
 
 int main()
 {
-  kwsys_stl::string libName = EXAMPLE_EXE_PLUGIN_DIR CONFIG_DIR "/";
+  std::string libName = EXAMPLE_EXE_PLUGIN_DIR CONFIG_DIR "/";
   libName += kwsys::DynamicLoader::LibPrefix();
   libName += "example_mod_1";
   libName += kwsys::DynamicLoader::LibExtension();
@@ -31,17 +31,17 @@ int main()
 kwsys::DynamicLoader::OpenLibrary(libName.c_str());
   if(!handle)
 {
-kwsys_ios::cerr << "Could not open plugin \""
-<< libName << "\"!" << kwsys_ios::endl;
+std::cerr << "Could not open plugin \""
+  << libName << "\"!" << std::endl;
 return 1;
 }
   kwsys::DynamicLoader::SymbolPointer sym =
 kwsys::DynamicLoader::GetSymbolAddress(handle, "example_mod_1_function");
   if(!sym)
 {
-kwsys_ios::cerr
+std::cerr
   << "Could not get plugin symbol \"example_mod_1_function\"!"
-  << kwsys_ios::endl;
+  << std::endl;
 return 1;
 }
 #ifdef __WATCOMC__
@@ -51,8 +51,8 @@ int main()
 #endif
   if(f(456) != (123+456))
 {
-kwsys_ios::cerr << "Incorrect return value from plugin!"
-<< kwsys_ios::endl;
+std::cerr << "Incorrect return value from plugin!"
+  << std::endl;
 return 1;
 }
   kwsys::DynamicLoader::CloseLibrary(handle);

---

Summary of changes:
 Tests/Plugin/src/example_exe.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 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, master, updated. v3.3.1-1032-g9a6d7d2

2015-08-31 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, master has been updated
   via  9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25 (commit)
   via  616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e (commit)
   via  ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 (commit)
   via  1e5349a5a0162cf5f75639717d374e73358df7b2 (commit)
  from  352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (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=9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25
commit 9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25
Merge: 352e8e9 616d8f0
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:30 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:30 2015 -0400

Merge topic 'refactor-compute'

616d8f02 cmGeneratorTarget: Rename method to match operation.
ec56d244 cmGlobalGenerator: Process evaluation files after target depends.
1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.


---

Summary of changes:
 Source/cmGeneratorTarget.cxx |2 +-
 Source/cmGeneratorTarget.h   |2 +-
 Source/cmGlobalGenerator.cxx |9 -
 Source/cmLocalGenerator.cxx  |4 ++--
 Source/cmLocalGenerator.h|2 +-
 5 files changed, 9 insertions(+), 10 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, master, updated. v3.3.1-1036-gd01e3c3

2015-08-31 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, master has been updated
   via  d01e3c31c9027983663918d5cbcba2a61aeb2f9f (commit)
   via  90a22c3ac5d38a83d4d487030277db4021c1913a (commit)
  from  5f6718c003dce82a64b7fee6e3cd95ecfc11548b (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=d01e3c31c9027983663918d5cbcba2a61aeb2f9f
commit d01e3c31c9027983663918d5cbcba2a61aeb2f9f
Merge: 5f6718c 90a22c3
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:35 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:35 2015 -0400

Merge topic 'FindJNI-mips'

90a22c3a FindJNI: Add mips64(el) mipsn32(el) support (#15714)


---

Summary of changes:
 Modules/FindJNI.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, master, updated. v3.3.1-1014-g97db5c5

2015-08-31 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, master has been updated
   via  97db5c567894c253173ab45c919925ce010ab05e (commit)
   via  3e2865b46744e543af3045331b31b94df2ebe1ad (commit)
  from  a036a4160597f83c13d2e513e2240e5a57b19a38 (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=97db5c567894c253173ab45c919925ce010ab05e
commit 97db5c567894c253173ab45c919925ce010ab05e
Merge: a036a41 3e2865b
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:26 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:26 2015 -0400

Merge topic 'GenerateExportHeader-cygwin-dllexport'

3e2865b4 GenerateExportHeader: Use dllexport/dllimport on Cygwin


---

Summary of changes:
 Modules/GenerateExportHeader.cmake   |2 +-
 Tests/Module/GenerateExportHeader/CMakeLists.txt |4 ++--
 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, master, updated. v3.3.1-1028-g352e8e9

2015-08-31 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, master has been updated
   via  352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (commit)
   via  2b9a25d7f723a9876e2979de8e6c06881e0312dc (commit)
   via  3e08b4df95208286d8891d76234f7910ff5c1d1c (commit)
   via  357bf469c7a6c6adad1f3269474989af9b203994 (commit)
   via  ebf8d0a99ac6eb231180b3315b976bcc58baa9f3 (commit)
   via  bd096d30e05fe66a0bf702fe7e366b0042ea14ae (commit)
   via  ff8ac8ee6ab3ee686621445456a765fa33c1a873 (commit)
   via  0bd7279fd9608702b7790822c80f3c284de8e7e4 (commit)
   via  2f2d4da9dd031cdf9f8a0cadcbdffe38c2170353 (commit)
   via  7fdc9a8b5f63f645b5aedede4fd18e0c1d1c39c5 (commit)
   via  92041eec49ab4968b2d4f09e3bd71a3720d86036 (commit)
   via  acb006229dbc531303538f4de1dc4d16d27369a5 (commit)
   via  83b8a927e5a992480e96b0be36ea0426a924c41f (commit)
   via  9b6a743b801dffa9f7ccab0c3e73fa8d22f3b8b9 (commit)
  from  97db5c567894c253173ab45c919925ce010ab05e (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=352e8e95b65e19cca10b4aec0c626787dfbb1ba1
commit 352e8e95b65e19cca10b4aec0c626787dfbb1ba1
Merge: 97db5c5 2b9a25d
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:28 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:28 2015 -0400

Merge topic 'generate-time-generators'

2b9a25d7 cmGlobalGenerator: Create global targets directly after Configure.
3e08b4df cmMakefile: Skip Global targets for CMP0019 evaluation.
357bf469 cmGlobalGenerator: Fill the project map at compute time.
ebf8d0a9 cmGlobalGenerator: Rename method.
bd096d30 cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
ff8ac8ee cmLocalGenerator: Create from already-constructed cmMakefile.
0bd7279f Ninja: Remove some incorrect comments adding no value.
2f2d4da9 cmCTestScriptHandler: Simplify deletes.
7fdc9a8b QtAutogen: Use a smart pointer.
92041eec cmGlobalGenerator: Remove MakeLocalGenerator method.
acb00622 cmGlobalGenerator: Require a snapshot to create a local generator.
83b8a927 cmMakefile: Remove cmLocalGenerator member.
9b6a743b cmLocalGenerator: Remove Parent pointer.


---

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx   |6 +-
 Source/CPack/cpack.cxx  |   10 ++--
 Source/CTest/cmCTestLaunch.cxx  |5 +-
 Source/CTest/cmCTestScriptHandler.cxx   |   46 ++-
 Source/CTest/cmCTestTestHandler.cxx |5 +-
 Source/cmCTest.cxx  |7 ++-
 Source/cmGlobalBorlandMakefileGenerator.cxx |4 +-
 Source/cmGlobalBorlandMakefileGenerator.h   |3 +-
 Source/cmGlobalGenerator.cxx|   80 +++
 Source/cmGlobalGenerator.h  |   11 +---
 Source/cmGlobalGhsMultiGenerator.cxx|5 +-
 Source/cmGlobalGhsMultiGenerator.h  |3 +-
 Source/cmGlobalNinjaGenerator.cxx   |5 +-
 Source/cmGlobalNinjaGenerator.h |   14 +
 Source/cmGlobalUnixMakefileGenerator3.cxx   |   14 +++--
 Source/cmGlobalUnixMakefileGenerator3.h |4 +-
 Source/cmGlobalVisualStudio10Generator.cxx  |7 +--
 Source/cmGlobalVisualStudio10Generator.h|3 +-
 Source/cmGlobalVisualStudio6Generator.cxx   |5 +-
 Source/cmGlobalVisualStudio6Generator.h |3 +-
 Source/cmGlobalVisualStudio7Generator.cxx   |7 +--
 Source/cmGlobalVisualStudio7Generator.h |3 +-
 Source/cmGlobalXCodeGenerator.cxx   |5 +-
 Source/cmGlobalXCodeGenerator.h |3 +-
 Source/cmGraphVizWriter.cxx |5 +-
 Source/cmLocalCommonGenerator.cxx   |5 +-
 Source/cmLocalCommonGenerator.h |4 +-
 Source/cmLocalGenerator.cxx |   11 ++--
 Source/cmLocalGenerator.h   |7 +--
 Source/cmLocalGhsMultiGenerator.cxx |5 +-
 Source/cmLocalGhsMultiGenerator.h   |3 +-
 Source/cmLocalNinjaGenerator.cxx|5 +-
 Source/cmLocalNinjaGenerator.h  |3 +-
 Source/cmLocalUnixMakefileGenerator3.cxx|5 +-
 Source/cmLocalUnixMakefileGenerator3.h  |4 +-
 Source/cmLocalVisualStudio10Generator.cxx   |6 +-
 Source/cmLocalVisualStudio10Generator.h |4 +-
 Source/cmLocalVisualStudio6Generator.cxx|6 +-
 Source/cmLocalVisualStudio6Generator.h  |4 +-
 Source/cmLocalVisualStudio7Generator.cxx|6 +-
 Source/cmLocalVisualStudio7Generator.h  |

[Cmake-commits] CMake branch, master, updated. v3.3.1-1034-g5f6718c

2015-08-31 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, master has been updated
   via  5f6718c003dce82a64b7fee6e3cd95ecfc11548b (commit)
   via  674dc0b33566b433b6ac5751f965b7d0ff952e73 (commit)
  from  9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25 (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=5f6718c003dce82a64b7fee6e3cd95ecfc11548b
commit 5f6718c003dce82a64b7fee6e3cd95ecfc11548b
Merge: 9a6d7d2 674dc0b
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:32 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:32 2015 -0400

Merge topic 'cpack-config-generation-test'

674dc0b3 CPack generator independent tests


---

Summary of changes:
 Tests/RunCMake/CMakeLists.txt  |1 +
 Tests/RunCMake/{CMP0064 => CPackConfig}/CMakeLists.txt |5 -
 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake  |3 +++
 Tests/RunCMake/CPackConfig/Simple-check.cmake  |3 +++
 Tests/RunCMake/CPackConfig/Simple.cmake|1 +
 Tests/RunCMake/CPackConfig/check.cmake |7 +++
 6 files changed, 19 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{CMP0064 => CPackConfig}/CMakeLists.txt (61%)
 create mode 100644 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/check.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, master, updated. v3.3.1-1043-g08ae6ce

2015-08-31 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, master has been updated
   via  08ae6ced4d5bbdb536a79e561eed54b28ae56836 (commit)
   via  ac0bb4333d13e633e26d107f288162d7d6a37b3a (commit)
   via  92b835ec9d17b190b13da93702f0eb416b665a48 (commit)
  from  e18f6fe276ea3ca576bb5f8fb910a6532280d900 (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=08ae6ced4d5bbdb536a79e561eed54b28ae56836
commit 08ae6ced4d5bbdb536a79e561eed54b28ae56836
Merge: e18f6fe ac0bb43
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:39 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:39 2015 -0400

Merge topic 'vs-store-phone-cert-thumbs'

ac0bb433 VS: Windows Store/Phone package cert thumbprint
92b835ec Simplify condition for using rpcrt4 library on Windows


---

Summary of changes:
 CMakeLists.txt |   11 
 CTestCustom.cmake.in   |1 +
 Source/CMakeLists.txt  |7 ++-
 Source/cmSystemTools.cxx   |   88 
 Source/cmSystemTools.h |3 +
 Source/cmVisualStudio10TargetGenerator.cxx |   16 -
 6 files changed, 111 insertions(+), 15 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-2645-g2af5650

2015-08-31 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  2af56500e8be3074ebb58060909d070b2557e17a (commit)
   via  51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (commit)
   via  08ae6ced4d5bbdb536a79e561eed54b28ae56836 (commit)
   via  e18f6fe276ea3ca576bb5f8fb910a6532280d900 (commit)
   via  d01e3c31c9027983663918d5cbcba2a61aeb2f9f (commit)
   via  5f6718c003dce82a64b7fee6e3cd95ecfc11548b (commit)
   via  9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25 (commit)
   via  352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (commit)
   via  97db5c567894c253173ab45c919925ce010ab05e (commit)
   via  a036a4160597f83c13d2e513e2240e5a57b19a38 (commit)
  from  6a01363837ba4aec29d788cdf89023a5470de460 (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=2af56500e8be3074ebb58060909d070b2557e17a
commit 2af56500e8be3074ebb58060909d070b2557e17a
Merge: 6a01363 51d7a7b
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:54 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 09:48:54 2015 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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, master, updated. v3.3.1-1045-g51d7a7b

2015-08-31 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, master has been updated
   via  51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (commit)
   via  bfb9d34f8afe66c2ce344b36db48568fc88950c9 (commit)
  from  08ae6ced4d5bbdb536a79e561eed54b28ae56836 (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=51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455
commit 51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455
Merge: 08ae6ce bfb9d34
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:42 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:42 2015 -0400

Merge topic 'makefile-color-when-needed'

bfb9d34f Makefile: Print color escapes only when necessary


---

Summary of changes:
 Source/cmSystemTools.cxx |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, master, updated. v3.3.1-1040-ge18f6fe

2015-08-31 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, master has been updated
   via  e18f6fe276ea3ca576bb5f8fb910a6532280d900 (commit)
   via  ab2524d63f651e6d96c770fb3571bddab4b86621 (commit)
   via  dee84dc73d88d05b9ad66908780c3e7c6ddc67ef (commit)
   via  b3372db588431f000b5fe3de980d6a2f27382eb1 (commit)
  from  d01e3c31c9027983663918d5cbcba2a61aeb2f9f (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=e18f6fe276ea3ca576bb5f8fb910a6532280d900
commit e18f6fe276ea3ca576bb5f8fb910a6532280d900
Merge: d01e3c3 ab2524d
Author: Brad King 
AuthorDate: Mon Aug 31 09:48:37 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:48:37 2015 -0400

Merge topic 'fix-ctest-xml-double-encoding'

ab2524d6 CTest: Fix XML double-encoding cases
dee84dc7 cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes
b3372db5 cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe 
includes

diff --cc Source/CTest/cmCTestGIT.cxx
index 5b9208a,c32e876..bbb3b9d
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@@ -14,9 -14,9 +14,8 @@@
  #include "cmCTest.h"
  #include "cmSystemTools.h"
  #include "cmAlgorithms.h"
- #include "cmXMLSafe.h"
  
  #include 
 -#include 
  #include 
  #include 
  
diff --cc Source/CTest/cmCTestP4.cxx
index 5ce431a,ad8e8b3..5e0c54a
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@@ -13,9 -13,9 +13,8 @@@
  
  #include "cmCTest.h"
  #include "cmSystemTools.h"
- #include "cmXMLSafe.h"
  
  #include 
 -#include 
  #include 
  
  #include 

---

Summary of changes:
 Source/CTest/cmCTestBZR.cxx |1 -
 Source/CTest/cmCTestGIT.cxx |1 -
 Source/CTest/cmCTestMemCheckHandler.cxx |   16 ++--
 Source/CTest/cmCTestP4.cxx  |1 -
 Source/CTest/cmCTestTestHandler.cxx |2 +-
 Source/cmCTest.cxx  |5 +
 Source/cmExtraKateGenerator.cxx |1 -
 Source/cmExtraSublimeTextGenerator.cxx  |1 -
 8 files changed, 8 insertions(+), 20 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-2650-gf83cd17

2015-08-31 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  f83cd172f23d35bdf2552dfcc781914f7b46e968 (commit)
   via  49d293a795c42c0325aa677d6a7c0f55c647da91 (commit)
   via  ca96be228345d93f51cb4edbd0428b709f529b84 (commit)
  from  cb09b3a0ea2bacd67523ebd85af6890b674caea8 (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=f83cd172f23d35bdf2552dfcc781914f7b46e968
commit f83cd172f23d35bdf2552dfcc781914f7b46e968
Merge: cb09b3a 49d293a
Author: Brad King 
AuthorDate: Mon Aug 31 09:58:33 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 31 09:58:33 2015 -0400

Merge topic 'update-kwsys' into next

49d293a7 Merge branch 'upstream-kwsys' into update-kwsys
ca96be22 KWSys 2015-08-24 (cdaf522c)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49d293a795c42c0325aa677d6a7c0f55c647da91
commit 49d293a795c42c0325aa677d6a7c0f55c647da91
Merge: 51d7a7b ca96be2
Author: Brad King 
AuthorDate: Mon Aug 31 09:55:01 2015 -0400
Commit: Brad King 
CommitDate: Mon Aug 31 09:55:01 2015 -0400

Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca96be228345d93f51cb4edbd0428b709f529b84
commit ca96be228345d93f51cb4edbd0428b709f529b84
Author: KWSys Robot 
AuthorDate: Mon Aug 24 22:44:47 2015 +
Commit: Brad King 
CommitDate: Mon Aug 31 09:54:42 2015 -0400

KWSys 2015-08-24 (cdaf522c)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ cdaf522c | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dad68c33..cdaf522c
Brad King (2):
  c8e5d1b2 Pass C++ standard flags to SunPro in standalone build
  91cb7820 Remove unused source file "CMakeEmptyInputFile.in"

James Johnston (6):
  0bca555e Process: Test running a process many times to discover 
resource leaks
  52788bb8 SystemTools:  Remove trailing whitespace.
  8122214c cmake: Set CMAKE_LEGACY_CYGWIN_WIN32 to 0.
  389d416b SystemTools:  Clarify/simplify behavior of FileExists
  8970cd56 SystemTools:  Added new TestFileAccess function.
  cdaf522c SystemTools:  Add honor_umask parameter to SetPermissions.

Mattias Ellert (1):
  b9df3e48 Fix implementation of KWSYS_PROPERTIES_C

diff --git a/CMakeEmptyInputFile.in b/CMakeEmptyInputFile.in
deleted file mode 100644
index 40b7ea2..000
--- a/CMakeEmptyInputFile.in
+++ /dev/null
@@ -1 +0,0 @@
-@CMAKE_EMPTY_INPUT_FILE_CONTENT@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 017d619..c1229ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,7 @@ ENDIF()
 IF(POLICY CMP0056)
   CMAKE_POLICY(SET CMP0056 NEW)
 ENDIF()
+SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
 
 #-
 # If a namespace is not specified, use "kwsys" and enable testing.
@@ -311,6 +312,15 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF()
   ENDIF()
 ENDIF()
+IF(KWSYS_STANDALONE)
+  IF(CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+ELSE()
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+ENDIF()
+  ENDIF()
+ENDIF()
 
 #-
 # Configure Large File Support.
@@ -1071,7 +1081,7 @@ IF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
 
   # Apply user-defined target properties to the library.
   IF(KWSYS_PROPERTIES_C)
-SET_TARGET_PROPERTIES(${KWSYS_NAMESPACE} PROPERTIES
+SET_TARGET_PROPERTIES(${KWSYS_NAMESPACE}_c PROPERTIES
   ${KWSYS_PROPERTIES_C}
   )
   ENDIF()
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 0714344..f12a06c 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -68,6 +68,10 @@
 #include 
 #include 
 
+#ifdef _MSC_VER
+# define umask _umask // Note this is still umask on Borland
+#endif
+
 // support for realpath call
 #ifndef _WIN32
 #include 
@@ -1233,13 +1237,11 @@ bool SystemTools::FileExists(const kwsys_stl::string& 
filename)
 //
 bool SystemTools::FileExists(const char* filename, bool isFile)
 {
-  if(SystemTools::FileExists(filename))
+  if(!filename)
 {
-// If isFile is set return not FileIsDirectory,
-// so this will only be true if it is a file
-return !isFile ||