date:20161227

[Cmake-commits] CMake branch, master, updated. v3.7.1-916-g58a0996

2016-12-27 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  58a09969f84eadd0f06adee33d3aaba09da26229 (commit)
  from  65fb0fa63279b96035a144fd2f6413d1b2def47f (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=58a09969f84eadd0f06adee33d3aaba09da26229
commit 58a09969f84eadd0f06adee33d3aaba09da26229
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Dec 28 00:01:09 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Dec 28 00:01:09 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4706bf8..adff987 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 20161227)
+set(CMake_VERSION_PATCH 20161228)
 #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-1861-gf96cd09

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

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

The branch, next has been updated
   via  f96cd09de6efbf13d9662eb99fe5911c36fd0ebb (commit)
   via  88f07fb417a25f98662da2abf09a9db03f48eb7f (commit)
  from  4c3b6121f4cd46550db6f2e00359b779ba54735e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
commit f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
Merge: 4c3b612 88f07fb
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 16:25:18 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 16:25:18 2016 -0500

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

88f07fb4 Xcode: Properly mark SYSTEM includes as such


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

Xcode: Properly mark SYSTEM includes as such

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

Closes: cmake/cmake#15687

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

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx

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

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

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

The branch, next has been updated
   via  4c3b6121f4cd46550db6f2e00359b779ba54735e (commit)
   via  fb55dc9d5b7a7e70770a783f41ec21c734f1fce7 (commit)
   via  65fb0fa63279b96035a144fd2f6413d1b2def47f (commit)
   via  2b301e11e2402690c43a7535656cba487559bd1f (commit)
   via  8b623e8a4af7451c718f448c8e27ce2b82347f76 (commit)
   via  df00ed13107ecb5e5b61ec07bb4190de0aaeb6b0 (commit)
  from  1890504c1220777f247462f00d9889a6d242e4bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c3b6121f4cd46550db6f2e00359b779ba54735e
commit 4c3b6121f4cd46550db6f2e00359b779ba54735e
Merge: 1890504 fb55dc9
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 10:43:15 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 10:43:15 2016 -0500

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

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


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

cmake-gui: Add MATCHALL option to Regex Explorer

Closes: #16204

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


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


 

---

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


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

[Cmake-commits] CMake branch, master, updated. v3.7.1-916-g58a0996

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

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

3 matches

Site Navigation

Mail list logo

Footer information