date:20161229

[Cmake-commits] CMake branch, master, updated. v3.7.1-918-gda04b68

2016-12-29 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  da04b68f3937ae2d4497068b41e7cd69d449320a (commit)
  from  2da3ae3bf76def94d3177f963703e3672ee27f1c (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=da04b68f3937ae2d4497068b41e7cd69d449320a
commit da04b68f3937ae2d4497068b41e7cd69d449320a
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Fri Dec 30 00:01:04 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Dec 30 00:01:04 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6b22619..ed8da4f 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 7)
-set(CMake_VERSION_PATCH 20161229)
+set(CMake_VERSION_PATCH 20161230)
 #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.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-1872-gf090b78

2016-12-29 Thread Daniel Pfeifer

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  f090b7818791116d3bd273403a91531e9a14d3fc (commit)
   via  4d7002fe4045e32dc3e5eefaff9ab2f20c878297 (commit)
  from  2969f55026a2bb77f063c6c119a9c9e3afc35854 (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=f090b7818791116d3bd273403a91531e9a14d3fc
commit f090b7818791116d3bd273403a91531e9a14d3fc
Merge: 2969f55 4d7002f
Author: Daniel Pfeifer 
AuthorDate: Thu Dec 29 15:19:29 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 29 15:19:29 2016 -0500

Merge topic 'require-tr1' into next

4d7002fe Revert "Require TR1"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d7002fe4045e32dc3e5eefaff9ab2f20c878297
commit 4d7002fe4045e32dc3e5eefaff9ab2f20c878297
Author: Daniel Pfeifer 
AuthorDate: Thu Dec 29 21:18:44 2016 +0100
Commit: Daniel Pfeifer 
CommitDate: Thu Dec 29 21:18:44 2016 +0100

Revert "Require TR1"

This reverts commit b0c31f93c84207b3c3a8ba31241ff2ee22886acf.

diff --git a/Source/Checks/cm_cxx_features.cmake 
b/Source/Checks/cm_cxx_features.cmake
index 23805be..80c9f3b 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -40,4 +40,6 @@ if(CMAKE_CXX_STANDARD)
   cm_check_cxx_feature(nullptr)
   cm_check_cxx_feature(override)
   cm_check_cxx_feature(unique_ptr)
+  cm_check_cxx_feature(unordered_map)
+  cm_check_cxx_feature(unordered_set)
 endif()
diff --git a/Source/Checks/cm_cxx_unordered_map.cxx 
b/Source/Checks/cm_cxx_unordered_map.cxx
new file mode 100644
index 000..be3de25
--- /dev/null
+++ b/Source/Checks/cm_cxx_unordered_map.cxx
@@ -0,0 +1,7 @@
+#include 
+int main()
+{
+  std::unordered_map map;
+  map[0] = 0;
+  return 0;
+}
diff --git a/Source/Checks/cm_cxx_unordered_set.cxx 
b/Source/Checks/cm_cxx_unordered_set.cxx
new file mode 100644
index 000..de4bb77
--- /dev/null
+++ b/Source/Checks/cm_cxx_unordered_set.cxx
@@ -0,0 +1,7 @@
+#include 
+int main()
+{
+  std::unordered_set set;
+  set.insert(0);
+  return 0;
+}
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 07eba12..26f1df2 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -25,6 +25,8 @@
 #cmakedefine CMake_HAVE_CXX_NULLPTR
 #cmakedefine CMake_HAVE_CXX_OVERRIDE
 #cmakedefine CMake_HAVE_CXX_UNIQUE_PTR
+#cmakedefine CMake_HAVE_CXX_UNORDERED_MAP
+#cmakedefine CMake_HAVE_CXX_UNORDERED_SET
 #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
 #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
 
diff --git a/Source/cm_unordered_map.hxx b/Source/cm_unordered_map.hxx
index 3a0d88a..dc8ca35 100644
--- a/Source/cm_unordered_map.hxx
+++ b/Source/cm_unordered_map.hxx
@@ -4,29 +4,22 @@
 #define CM_UNORDERED_MAP_HXX
 
 #include 
-#include 
 
-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L)
-#include 
-#else
-#include 
-#endif
+#if defined(CMake_HAVE_CXX_UNORDERED_MAP)
 
-namespace cm {
+#include 
+#define CM_UNORDERED_MAP std::unordered_map
 
-#if (defined(_CPPLIB_VER) && _CPPLIB_VER < 520) ||\
-  (defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L))
+#elif defined(CMAKE_BUILD_WITH_CMAKE)
 
-using namespace std::tr1;
+#include 
+#define CM_UNORDERED_MAP cmsys::hash_map
 
 #else
 
-using namespace std;
+#include 
+#define CM_UNORDERED_MAP std::map
 
 #endif
 
-} // end namespace cm
-
-#define CM_UNORDERED_MAP cm::unordered_map
-
 #endif
diff --git a/Source/cm_unordered_set.hxx b/Source/cm_unordered_set.hxx
index 1f66e00..ce58dbf 100644
--- a/Source/cm_unordered_set.hxx
+++ b/Source/cm_unordered_set.hxx
@@ -4,29 +4,22 @@
 #define CM_UNORDERED_SET_HXX
 
 #include 
-#include 
 
-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L)
-#include 
-#else
-#include 
-#endif
+#if defined(CMake_HAVE_CXX_UNORDERED_SET)
 
-namespace cm {
+#include 
+#define CM_UNORDERED_SET std::unordered_set
 
-#if (defined(_CPPLIB_VER) && _CPPLIB_VER < 520) ||\
-  (defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L))
+#elif defined(CMAKE_BUILD_WITH_CMAKE)
 
-using namespace std::tr1;
+#include 
+#define CM_UNORDERED_SET cmsys::hash_set
 
 #else
 
-using namespace std;
+#include 
+#define CM_UNORDERED_SET std::set
 
 #endif
 
-} // end namespace cm
-
-#define CM_UNORDERED_SET cm::unordered_set
-
 #endif

---

Summary of changes:
 Source/Checks/cm_cxx_features.cmake|

[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, master, updated. v3.7.1-918-gda04b68

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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1872-gf090b78

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

4 matches

Site Navigation

Mail list logo

Footer information