[Cmake-commits] CMake branch, master, updated. v3.8.1-1036-gec52676
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 ec526768ac5f1e00a39075cd07fd93cffa1f1818 (commit) from 84d0841ed7d06779b68a3950054b636f6ef4af74 (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=ec526768ac5f1e00a39075cd07fd93cffa1f1818 commit ec526768ac5f1e00a39075cd07fd93cffa1f1818 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Thu May 4 00:01:04 2017 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Thu May 4 00:01:04 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b99ead6..ce87fe2 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 8) -set(CMake_VERSION_PATCH 20170503) +set(CMake_VERSION_PATCH 20170504) #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, master, updated. v3.8.1-1035-g84d0841
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 84d0841ed7d06779b68a3950054b636f6ef4af74 (commit) via 0d8273fa32bdeb7f8bd939864ba6d6ea147e642d (commit) via e335771157a1361e250989a5f2d7540144409e78 (commit) from 1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2 (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=84d0841ed7d06779b68a3950054b636f6ef4af74 commit 84d0841ed7d06779b68a3950054b636f6ef4af74 Merge: 1fe2dc5 0d8273f Author: Brad KingAuthorDate: Wed May 3 15:10:15 2017 + Commit: Kitware Robot CommitDate: Wed May 3 11:10:19 2017 -0400 Merge topic 'update-vim-syntax' 0d8273fa Merge branch 'upstream-vim-cmake-syntax' e3357711 vim-cmake-syntax 2017-05-02 (15526199) Acked-by: Kitware Robot Merge-request: !789 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d8273fa32bdeb7f8bd939864ba6d6ea147e642d commit 0d8273fa32bdeb7f8bd939864ba6d6ea147e642d Merge: 3960038 e335771 Author: Patrick Boettcher AuthorDate: Tue May 2 17:34:53 2017 +0200 Commit: Patrick Boettcher CommitDate: Tue May 2 17:34:53 2017 +0200 Merge branch 'upstream-vim-cmake-syntax' * upstream-vim-cmake-syntax: vim-cmake-syntax 2017-05-02 (15526199) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e335771157a1361e250989a5f2d7540144409e78 commit e335771157a1361e250989a5f2d7540144409e78 Author: vim-cmake-syntax upstream AuthorDate: Tue May 2 13:49:23 2017 +0200 Commit: Patrick Boettcher CommitDate: Tue May 2 17:34:33 2017 +0200 vim-cmake-syntax 2017-05-02 (15526199) Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit 155261999e9affb087e9034ed6009396de6b8f28 (master). Upstream Shortlog - Patrick Boettcher (7): eb4537d6 no tab in CMake-files 933b6aea update syntax to cmake-version 3.7.1 545bddcd fix highlighting of keyword variables in ${}-regions and cleanups 9c06c8fb README updated 2ca39d28 make keywords contained, to inhibit highlighting when outside highlighting 6cb8352f do not highlight strings outside regions 15526199 update to 3.8.20170502-g7a806 diff --git a/cmake.vim.in b/cmake.vim.in index 89ece66..389d9e4 100644 --- a/cmake.vim.in +++ b/cmake.vim.in @@ -14,54 +14,56 @@ if exists("b:current_syntax") finish endif -syn match cmakeEscaped /\(\|\\"\|\\n\|\\t\)/ contained syn region cmakeComment start="#" end="$" contains=cmakeTodo,@Spell syn region cmakeLuaComment start="\[\z(=*\)\[" end="\]\z1\]" contains=cmakeTodo,@Spell -syn region cmakeGeneratorExpression start=/$/ -\ contained oneline contains=CONTAINED,cmakeTodo,cmakeVariable,cmakeProperty,cmakeGeneratorExpressions -syn region cmakeRegistry start=/\[/ end=/]/ -\ contained oneline contains=CONTAINED,cmakeTodo,cmakeEscaped -syn region cmakeVariableValue start=/\${/ end=/}/ -\ contained oneline contains=CONTAINED,cmakeTodo,cmakeVariable -syn region cmakeEnvironment start=/\$ENV{/ end=/}/ -\ contained oneline contains=CONTAINED,cmakeTodo -syn region cmakeString start=/"/ end=/"/ -\ contains=CONTAINED,cmakeTodo -syn region cmakeArguments start=/(/ end=/)/ -\ contains=ALLBUT,cmakeArguments,cmakeTodo + +syn match cmakeEscaped /\(\|\\"\|\\n\|\\t\)/ contained +syn region cmakeRegistry start="\[" end="]" contained oneline contains=cmakeTodo,cmakeEscaped + +syn region cmakeGeneratorExpression start="$<" end=">" contained oneline contains=cmakeVariableValue,cmakeProperty,cmakeGeneratorExpressions,cmakeTodo + +syn region cmakeString start='"' end='"' contained contains=cmakeTodo,cmakeVariableValue + +syn region cmakeVariableValue start="${" end="}" contained oneline contains=cmakeVariable,cmakeTodo + +syn region cmakeEnvironment start="$ENV{" end="}" contained oneline contains=cmakeTodo + +syn region cmakeArguments start="(" end=")" contains=ALLBUT,cmakeArguments,cmakeTodo syn case match -syn keyword cmakeProperty + +syn keyword cmakeProperty contained \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR
[Cmake-commits] CMake branch, master, updated. v3.8.1-1032-g1fe2dc5
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 1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2 (commit) via bf3c08d648c398026eef363bb43d3f8bfaf2a286 (commit) via f1e91c694b1581b4ae923b3bd4a243372cb29023 (commit) via 7e75568b001e29a7428d7489c57cebd909359571 (commit) via 0225417f60ebaa9de96dd9a9846c2ef7105a39f1 (commit) via d908987634ad1dd1295ac585ffe7c810bda69415 (commit) via 174c02e149ab4bcc9bc98d4e4042eb0b24e2f2ee (commit) via 08fa2ba8d0682e0c9c307b572afbcee05cc93477 (commit) via 0198502ff4fa3dec9cbd3249f6f458f53a8087f3 (commit) via d1aa2b3f607b35dc5dbf613b2334b6d243ec2bda (commit) via 87b9d6d93f2e5e6076992cae7395647359de306d (commit) from 96820279541017402c1fe0852444aac68179ddb7 (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=1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2 commit 1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2 Merge: bf3c08d 7e75568 Author: Brad KingAuthorDate: Wed May 3 15:04:08 2017 + Commit: Kitware Robot CommitDate: Wed May 3 11:04:17 2017 -0400 Merge topic 'ipo-xcode' 7e75568b Xcode: Support IPO (LTO) Acked-by: Kitware Robot Merge-request: !785 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf3c08d648c398026eef363bb43d3f8bfaf2a286 commit bf3c08d648c398026eef363bb43d3f8bfaf2a286 Merge: f1e91c6 d908987 Author: Brad King AuthorDate: Wed May 3 15:00:59 2017 + Commit: Kitware Robot CommitDate: Wed May 3 11:01:12 2017 -0400 Merge topic 'port-language-default-to-common-macro' d9089876 AppleClang: Use common compiler macros for language standard default 174c02e1 SunPro: Use common compiler macros for language standard default 08fa2ba8 Clang: Use common compiler macros for language standard default 0198502f Intel: Use common compiler macros for language standard default d1aa2b3f GNU: Use common compiler macros for language standard default 87b9d6d9 XL: Use common compiler macros for language standard default Acked-by: Kitware Robot Merge-request: !787 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1e91c694b1581b4ae923b3bd4a243372cb29023 commit f1e91c694b1581b4ae923b3bd4a243372cb29023 Merge: 9682027 0225417 Author: Brad King AuthorDate: Wed May 3 15:00:43 2017 + Commit: Kitware Robot CommitDate: Wed May 3 11:00:51 2017 -0400 Merge topic 'fix-typo-in-pgi-files' 0225417f PGI: Fix typo in logic for C standard flags Acked-by: Kitware Robot Merge-request: !788 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e75568b001e29a7428d7489c57cebd909359571 commit 7e75568b001e29a7428d7489c57cebd909359571 Author: Ruslan Baratov AuthorDate: Thu Apr 27 21:18:26 2017 +0800 Commit: Ruslan Baratov CommitDate: Tue May 2 18:33:25 2017 +0300 Xcode: Support IPO (LTO) diff --git a/Modules/CheckIPOSupported.cmake b/Modules/CheckIPOSupported.cmake index 712a95e..6bbde13 100644 --- a/Modules/CheckIPOSupported.cmake +++ b/Modules/CheckIPOSupported.cmake @@ -217,7 +217,7 @@ function(check_ipo_supported) return() endif() - if(CMAKE_GENERATOR MATCHES "^(Visual Studio |Xcode$)") + if(CMAKE_GENERATOR MATCHES "^Visual Studio ") _ipo_not_supported("CMake doesn't support IPO for current generator") return() endif() diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d99e3bb..95c1236 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1683,8 +1683,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, return; } - // Check IPO related warning/error. - gtgt->IsIPOEnabled(configName); + if (gtgt->IsIPOEnabled(configName)) { +const char* ltoValue = + this->CurrentMakefile->IsOn("_CMAKE_LTO_THIN") ? "YES_THIN" : "YES"; +buildSettings->AddAttribute("LLVM_LTO", this->CreateString(ltoValue)); + } // Add define flags this->CurrentLocalGenerator->AppendFlags( diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index ee06074..a5d169f 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -90,6 +90,8 @@ public: bool HasKnownObjectFileLocation(std::string* reason) const CM_OVERRIDE; + bool IsIPOSupported() const CM_OVERRIDE {