date:20161228

[Cmake-commits] CMake branch, master, updated. v3.7.1-917-g2da3ae3

2016-12-28 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  2da3ae3bf76def94d3177f963703e3672ee27f1c (commit)
  from  58a09969f84eadd0f06adee33d3aaba09da26229 (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=2da3ae3bf76def94d3177f963703e3672ee27f1c
commit 2da3ae3bf76def94d3177f963703e3672ee27f1c
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Thu Dec 29 00:01:10 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Dec 29 00:01:10 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index adff987..6b22619 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 20161228)
+set(CMake_VERSION_PATCH 20161229)
 #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-1868-g3c5549e

2016-12-28 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  3c5549e5d6d8b3651f7696e5f9daade18ffab621 (commit)
   via  b0c31f93c84207b3c3a8ba31241ff2ee22886acf (commit)
  from  54fd0836989e2a4bb8711265499e09e6ffd5c3d8 (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=3c5549e5d6d8b3651f7696e5f9daade18ffab621
commit 3c5549e5d6d8b3651f7696e5f9daade18ffab621
Merge: 54fd083 b0c31f9
Author: Daniel Pfeifer 
AuthorDate: Wed Dec 28 16:31:37 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 28 16:31:37 2016 -0500

Merge topic 'require-tr1' into next

b0c31f93 Require TR1


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0c31f93c84207b3c3a8ba31241ff2ee22886acf
commit b0c31f93c84207b3c3a8ba31241ff2ee22886acf
Author: Daniel Pfeifer 
AuthorDate: Wed Dec 28 20:41:17 2016 +0100
Commit: Daniel Pfeifer 
CommitDate: Wed Dec 28 20:41:17 2016 +0100

Require TR1

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

---

Summary of changes:
 Source/Checks/cm_cxx_features.cmake|2 --
 Source/Checks/cm_cxx_unordered_map.cxx |7 ---

[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, master, updated. v3.7.1-917-g2da3ae3

[Cmake-commits] CMake branch, next, updated. v3.7.1-1868-g3c5549e

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

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

4 matches

Site Navigation

Mail list logo

Footer information