[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-456-gd6ef59f
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 d6ef59f5a39f9748f44abdba80f596c16b6984a3 (commit) from 60d80bca4afcfb3a38b588a5a2060cc275b4afbc (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=d6ef59f5a39f9748f44abdba80f596c16b6984a3 commit d6ef59f5a39f9748f44abdba80f596c16b6984a3 Author: Kitware Robot AuthorDate: Fri Nov 4 00:01:11 2016 -0400 Commit: Kitware Robot CommitDate: Fri Nov 4 00:01:11 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 141d2a9..b3cff47 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 20161103) +set(CMake_VERSION_PATCH 20161104) #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.0-rc2-935-gcec11d1
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 cec11d1d4731389dda229442da834dddf5bdb56c (commit) via 60d80bca4afcfb3a38b588a5a2060cc275b4afbc (commit) from 0e78a19123015e727c82b06f84859194a7ee7571 (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=cec11d1d4731389dda229442da834dddf5bdb56c commit cec11d1d4731389dda229442da834dddf5bdb56c Merge: 0e78a19 60d80bc Author: Brad King AuthorDate: Thu Nov 3 10:43:05 2016 -0400 Commit: Brad King CommitDate: Thu Nov 3 10:43:05 2016 -0400 Merge branch 'master' into next --- 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, master, updated. v3.7.0-rc2-455-g60d80bc
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 60d80bca4afcfb3a38b588a5a2060cc275b4afbc (commit) via 9c507c13a0cffb163a1d56f34c020b5474a3e100 (commit) from dec0cfcef012ca762a731d6e096012fa1c072f14 (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 - --- 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 annotated tag, v3.6.3, created. v3.6.3
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 annotated tag, v3.6.3 has been created at a2f08cbcf890eddf45e3de50a05b97764d841ae3 (tag) tagging 9c507c13a0cffb163a1d56f34c020b5474a3e100 (commit) replaces v3.6.2 tagged by Brad King on Thu Nov 3 10:39:28 2016 -0400 - Log - CMake 3.6.3 -BEGIN PGP SIGNATURE- iQIzBAABCAAdBQJYG0wgFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS FoRwHg//SSOmihE4QSmEGHgswtSapYO024uxYLpV8yYLlx4m8asQNjpQz+dbnSgh 3s64f4/cYQH5KDsqwK7VBfGOJFYFO6D7g8ruZ7AlWYW0wiMPL3QAiy0zsKEp9S0f 0eOXWFlgAADepq+WauseTWCmTe49BCOT6DpwWsSjJIz1QxIfKAOlwbZ7UpNPUBii u2ZT8cWlMonP9LE7bJyTzlMtuN93+yjUBOVTi4B6NZ76rG7p3Nm1Y7WptX2HAz/X FrU9hXtFPWiGf7Chq+f+5/bagbjOrc1lqZxMGouVe1r4t+GJFz5eqCCZXAAfisN2 UacCmsLxadbmFVeJkd23fywKHnUq6k8JRDYN9Lgu99F/smkDeTjbZoHBErrrfjYb 22+chwDsVIGclRZ2l7evuKAn1OFIEIcnT+WjXOGKSxLsTwTEQ1p3QPrbAoFDIM9N FNMfidP0mui7O05iouiqCMsPptRqoHwfP03NsZ7b6VLliC6QQ7EAXyWnCVRlYG9B IN/Ep0Y1U7sNXHhOPnfBy2x0j6Q2vsc6R0nU4jVrWlUkJc0+aFheu0pgWn1X9IAp R89EDMP9tdMoaXbWpaFyZ4jPkBU5mHPIPn/4uo73FB4+/uQvrCnOkwzUST/ks7BK +LzzsE4sVmzRnB/gUu4h88et4dqq3JdUDRW2nhMsSsIzpb8vtmQ= =dp8r -END PGP SIGNATURE- Brad King (4): FindHDF5: Restore pre-3.6 behavior of finding only C by default Merge branch 'qtdialog-lib-paths' into release-3.6 Merge branch 'FindHDF5-restore-default-C' into release-3.6 CMake 3.6.3 Clinton Stimpson (1): cmake-gui: Do not remove library paths for Qt5 plugins. --- 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.0-rc2-933-g0e78a19
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 0e78a19123015e727c82b06f84859194a7ee7571 (commit) via 6db1846a898e7651720ac03f5d4c869f95729f0c (commit) via 9c507c13a0cffb163a1d56f34c020b5474a3e100 (commit) from f4570ad0d275896fa14d09bfa871b938b4a3b894 (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=0e78a19123015e727c82b06f84859194a7ee7571 commit 0e78a19123015e727c82b06f84859194a7ee7571 Merge: f4570ad 6db1846 Author: Brad King AuthorDate: Thu Nov 3 09:36:41 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Nov 3 09:36:41 2016 -0400 Merge topic 'test-release' into next 6db1846a Merge branch 'release-3.6' into test-release 9c507c13 CMake 3.6.3 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6db1846a898e7651720ac03f5d4c869f95729f0c commit 6db1846a898e7651720ac03f5d4c869f95729f0c Merge: dec0cfc 9c507c1 Author: Brad King AuthorDate: Thu Nov 3 09:36:26 2016 -0400 Commit: Brad King CommitDate: Thu Nov 3 09:36:26 2016 -0400 Merge branch 'release-3.6' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c507c13a0cffb163a1d56f34c020b5474a3e100 commit 9c507c13a0cffb163a1d56f34c020b5474a3e100 Author: Brad King AuthorDate: Wed Nov 2 11:46:41 2016 -0400 Commit: Brad King CommitDate: Wed Nov 2 11:46:41 2016 -0400 CMake 3.6.3 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 241cc8d..7d71044 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 6) -set(CMake_VERSION_PATCH 2) +set(CMake_VERSION_PATCH 3) #set(CMake_VERSION_RC 0) --- 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.7.0-rc2-930-gf4570ad
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 f4570ad0d275896fa14d09bfa871b938b4a3b894 (commit)
via 20cc76c93a7f7ba1dd8a38e8311c0e9702395b27 (commit)
from 54eed9ada656ea5f43d55d4e7b03945889365689 (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=f4570ad0d275896fa14d09bfa871b938b4a3b894
commit f4570ad0d275896fa14d09bfa871b938b4a3b894
Merge: 54eed9a 20cc76c
Author: Brad King
AuthorDate: Thu Nov 3 09:28:50 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Nov 3 09:28:50 2016 -0400
Merge topic 'cpackifw-search-algorithm' into next
20cc76c9 CPackIFW: Update search to find QtIFW distributed with QtSDK
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20cc76c93a7f7ba1dd8a38e8311c0e9702395b27
commit 20cc76c93a7f7ba1dd8a38e8311c0e9702395b27
Author: Konstantin Podsvirov
AuthorDate: Wed Nov 2 23:15:07 2016 +0300
Commit: Brad King
CommitDate: Thu Nov 3 09:28:15 2016 -0400
CPackIFW: Update search to find QtIFW distributed with QtSDK
Also avoid CMP0007 warnings.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 6c93ddb..08078cb 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -433,11 +433,15 @@
# Default path
-set(_CPACK_IFW_PATHS
- "${QTIFWDIR}"
- "$ENV{QTIFWDIR}"
- "${QTDIR}"
- "$ENV{QTIFWDIR}")
+foreach(_CPACK_IFW_PATH_VAR "QTIFWDIR" "QTDIR")
+ if(DEFINED ${_CPACK_IFW_PATH_VAR}
+AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")
+ endif()
+ if(NOT "$ENV{${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+list(APPEND _CPACK_IFW_PATHS "$ENV{${_CPACK_IFW_PATH_VAR}}")
+ endif()
+endforeach()
if(WIN32)
list(APPEND _CPACK_IFW_PATHS
"$ENV{HOMEDRIVE}/Qt"
@@ -447,22 +451,44 @@ else()
"$ENV{HOME}/Qt"
"/opt/Qt")
endif()
-
-set(_CPACK_IFW_SUFFIXES
-# Common
- "bin"
-# Second branch
- "QtIFW2.3.0/bin"
- "QtIFW2.2.0/bin"
- "QtIFW2.1.0/bin"
- "QtIFW2.0.3/bin"
- "QtIFW2.0.1/bin"
- "QtIFW2.0.0/bin"
-# First branch
- "QtIFW-1.6.0/bin"
- "QtIFW-1.5.0/bin"
- "QtIFW-1.4.0/bin"
- "QtIFW-1.3.0/bin")
+list(REMOVE_DUPLICATES _CPACK_IFW_PATHS)
+
+set(_CPACK_IFW_PREFIXES
+ # QtSDK
+ "Tools/QtInstallerFramework/"
+ # Second branch
+ "QtIFW"
+ # First branch
+ "QtIFW-")
+
+set(_CPACK_IFW_VERSIONS
+ "2.3"
+ "2.3.0"
+ "2.2"
+ "2.2.0"
+ "2.1"
+ "2.1.0"
+ "2.0"
+ "2.0.3"
+ "2.0.2"
+ "2.0.1"
+ "2.0.0"
+ "1.6"
+ "1.6.0"
+ "1.5"
+ "1.5.0"
+ "1.4"
+ "1.4.0"
+ "1.3"
+ "1.3.0")
+
+set(_CPACK_IFW_SUFFIXES "bin")
+foreach(_CPACK_IFW_PREFIX ${_CPACK_IFW_PREFIXES})
+ foreach(_CPACK_IFW_VERSION ${_CPACK_IFW_VERSIONS})
+list(APPEND
+ _CPACK_IFW_SUFFIXES "${_CPACK_IFW_PREFIX}${_CPACK_IFW_VERSION}/bin")
+ endforeach()
+endforeach()
# Look for 'binarycreator'
---
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.7.0-rc2-928-g54eed9a
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 54eed9ada656ea5f43d55d4e7b03945889365689 (commit)
via 4cb5d3353f488ee7bf3943619e67a5664dbae8df (commit)
from a279f9378ad9b8692230ddb9d74d8825d19c2a27 (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=54eed9ada656ea5f43d55d4e7b03945889365689
commit 54eed9ada656ea5f43d55d4e7b03945889365689
Merge: a279f93 4cb5d33
Author: Brad King
AuthorDate: Thu Nov 3 09:01:41 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Nov 3 09:01:41 2016 -0400
Merge topic 'vs-flag-order' into next
4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cb5d3353f488ee7bf3943619e67a5664dbae8df
commit 4cb5d3353f488ee7bf3943619e67a5664dbae8df
Author: Brad King
AuthorDate: Wed Nov 2 13:08:14 2016 -0400
Commit: Brad King
CommitDate: Wed Nov 2 13:11:08 2016 -0400
VS: Place source-specific AdditionalOptions after target-wide flags
Flags specified in the `COMPILE_FLAGS` source-file property should
be placed after those in target-wide properties so that those on
individual source files can override those on the whole target.
This is already done by most generators but was not implemented
correctly for VS 2010 and above.
Closes: #16400
diff --git a/Help/release/dev/vs-flag-order.rst
b/Help/release/dev/vs-flag-order.rst
new file mode 100644
index 000..21cea37
--- /dev/null
+++ b/Help/release/dev/vs-flag-order.rst
@@ -0,0 +1,9 @@
+vs-flag-order
+-
+
+* The :ref:`Visual Studio Generators` for VS 2010 and above now place
+ per-source file flags after target-wide flags when they are classified
+ as raw flags with no project file setting (``AdditionalOptions``).
+ This behavior is more consistent with the ordering of flags produced
+ by other generators, and allows flags on more-specific properties
+ (per-source) to override those on more general ones (per-target).
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx
b/Source/cmVisualStudioGeneratorOptions.cxx
index 4be183d..e751bfc 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -334,8 +334,9 @@ void
cmVisualStudioGeneratorOptions::OutputAdditionalOptions(
} else {
fout << "";
}
- fout << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString)
- << " %(AdditionalOptions)\n";
+ fout << "%(AdditionalOptions) "
+ << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString)
+ << "\n";
} else {
fout << prefix << "AdditionalOptions=\"";
fout << cmVisualStudioGeneratorOptionsEscapeForXML(this->FlagString);
---
Summary of changes:
Help/release/dev/vs-flag-order.rst|9 +
Source/cmVisualStudioGeneratorOptions.cxx |5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/vs-flag-order.rst
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.0-rc2-453-gdec0cfc
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 dec0cfcef012ca762a731d6e096012fa1c072f14 (commit) via a12e148b8a7611d097158bc2acf4ae19ed2c9d18 (commit) via 967e9aafda9054a3e963923d14514075225f7792 (commit) via de25d988bccc2d81ce137d763246aadafda336ea (commit) via 5f7f0ab517d9f4fbc11292a1bada37a74ba69b97 (commit) from acc2e03d798eeebdecd8198ae8eba495f8ccc5e7 (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 - --- 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.7.0-rc2-926-ga279f93
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 a279f9378ad9b8692230ddb9d74d8825d19c2a27 (commit) via dec0cfcef012ca762a731d6e096012fa1c072f14 (commit) via a12e148b8a7611d097158bc2acf4ae19ed2c9d18 (commit) via 967e9aafda9054a3e963923d14514075225f7792 (commit) via de25d988bccc2d81ce137d763246aadafda336ea (commit) via 5f7f0ab517d9f4fbc11292a1bada37a74ba69b97 (commit) from 5b24b80fd4b77b5078d2a6f49c988ba6c937c901 (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=a279f9378ad9b8692230ddb9d74d8825d19c2a27 commit a279f9378ad9b8692230ddb9d74d8825d19c2a27 Merge: 5b24b80 dec0cfc Author: Brad King AuthorDate: Thu Nov 3 08:58:44 2016 -0400 Commit: Brad King CommitDate: Thu Nov 3 08:58:44 2016 -0400 Merge branch 'master' into next --- 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, release, updated. v3.7.0-rc2-36-g5f7f0ab
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, release has been updated via 5f7f0ab517d9f4fbc11292a1bada37a74ba69b97 (commit) via ff3ccc1f2315d3de91ee6a90c8754ea554965c1d (commit) from c555eca9ba8e518dd8f91159d94a2a2bf58916b0 (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 - --- Summary of changes: Modules/FindHDF5.cmake | 12 ++-- 1 file changed, 2 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.7.0-rc2-448-gacc2e03
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 acc2e03d798eeebdecd8198ae8eba495f8ccc5e7 (commit) via ff3ccc1f2315d3de91ee6a90c8754ea554965c1d (commit) from 3dd99758d1f912d0edc2df05b6d2cfabd5005efe (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=acc2e03d798eeebdecd8198ae8eba495f8ccc5e7 commit acc2e03d798eeebdecd8198ae8eba495f8ccc5e7 Merge: 3dd9975 ff3ccc1 Author: Brad King AuthorDate: Thu Nov 3 08:54:43 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Nov 3 08:54:43 2016 -0400 Merge topic 'FindHDF5-restore-default-C' ff3ccc1f FindHDF5: Restore pre-3.6 behavior of finding only C by default --- Summary of changes: Modules/FindHDF5.cmake | 12 ++-- 1 file changed, 2 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.7.0-rc2-444-ge106a6e
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 e106a6eafb42dd3c6557e964e04339dcd5787ad4 (commit) via 9a8d758c3a27833dccf21102ae753de314684b0d (commit) via df252db15a0e539be255536417f36045301db02c (commit) via 6d5fb0e0d0464d50ae58673bf5543b0d052dc681 (commit) via a34b98a834bf6ac044e8590c3fe644c9307124e9 (commit) via b0996a3fa223370edcdb40a1d8b66d1a3a734daf (commit) via 8b6cc2518a8019314af43a32702a09bff318b777 (commit) via 2d23f7b206c908e55999143487548e2d6a92bc79 (commit) from 90e09fb958e761b416863052ca5408ed4280443b (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=e106a6eafb42dd3c6557e964e04339dcd5787ad4 commit e106a6eafb42dd3c6557e964e04339dcd5787ad4 Merge: 90e09fb 9a8d758 Author: Brad King AuthorDate: Thu Nov 3 08:54:33 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Nov 3 08:54:33 2016 -0400 Merge topic 'compile-features-for-language-standards' 9a8d758c Help: Document language standard meta-features df252db1 Features: Test cycle diagnostic with language standard meta-feature 6d5fb0e0 Features: Test feature propagation with language standard meta-feature a34b98a8 WCDH: Ignore language standard meta-features b0996a3f Features: Add meta-features requesting awareness of a particular standard 8b6cc251 Features: Centralize per-compiler recording macros 2d23f7b2 Features: Do not record features on MSVC < 2010 --- Summary of changes: Help/manual/cmake-compile-features.7.rst | 27 Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst |9 +++ Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst |9 +++ .../compile-features-for-language-standards.rst|7 + Modules/Compiler/AppleClang-C.cmake| 10 +++- Modules/Compiler/AppleClang-CXX.cmake | 10 +++- Modules/Compiler/Clang-C.cmake | 10 +++- Modules/Compiler/Clang-CXX.cmake | 10 +++- Modules/Compiler/GNU-C.cmake | 10 +++- Modules/Compiler/GNU-CXX.cmake | 10 +++- Modules/Compiler/Intel-C.cmake | 10 +++- Modules/Compiler/Intel-CXX.cmake | 10 +++- Modules/Compiler/MSVC-CXX.cmake|9 ++- Modules/Compiler/SunPro-CXX.cmake | 10 +++- Modules/Internal/FeatureTesting.cmake | 12 - Modules/WriteCompilerDetectionHeader.cmake |7 - Source/cmake.h |6 + Tests/CompileFeatures/CMakeLists.txt | 10 +--- .../LinkImplementationFeatureCycle.cmake |4 +-- .../LinkImplementationFeatureCycleSolved.cmake |2 +- 20 files changed, 120 insertions(+), 72 deletions(-) create mode 100644 Help/release/dev/compile-features-for-language-standards.rst 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.0-rc2-446-g3dd9975
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 3dd99758d1f912d0edc2df05b6d2cfabd5005efe (commit) via baead1e2a8ff7938f6be9c5fc01762e2ace9 (commit) from e106a6eafb42dd3c6557e964e04339dcd5787ad4 (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=3dd99758d1f912d0edc2df05b6d2cfabd5005efe commit 3dd99758d1f912d0edc2df05b6d2cfabd5005efe Merge: e106a6e baead1e Author: Brad King AuthorDate: Thu Nov 3 08:54:37 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Nov 3 08:54:37 2016 -0400 Merge topic 'remove-utf8-option' baead1e2 Encoding: Remove option to use ANSI code page internally --- Summary of changes: CMakeLists.txt|8 ++ Source/CPack/WiX/cmCPackWIXGenerator.cxx |3 +-- Source/CPack/WiX/cmWIXSourceWriter.cxx| 41 + Source/CPack/WiX/cmWIXSourceWriter.h |2 -- Source/QtDialog/CMakeSetup.cxx|2 -- Source/cmConfigure.cmake.h.in |1 - Source/cmFileCommand.cxx |6 ++--- Source/cmGlobalVisualStudio7Generator.cxx |8 +- 8 files changed, 8 insertions(+), 63 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.7.0-rc2-920-g5b24b80
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 5b24b80fd4b77b5078d2a6f49c988ba6c937c901 (commit) via acc2e03d798eeebdecd8198ae8eba495f8ccc5e7 (commit) via 3dd99758d1f912d0edc2df05b6d2cfabd5005efe (commit) via e106a6eafb42dd3c6557e964e04339dcd5787ad4 (commit) via 90e09fb958e761b416863052ca5408ed4280443b (commit) via ffe78961ada28f3777066228b4e5870889b42f70 (commit) from 17c1cb103036976fed9b4b476654821629c177a0 (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=5b24b80fd4b77b5078d2a6f49c988ba6c937c901 commit 5b24b80fd4b77b5078d2a6f49c988ba6c937c901 Merge: 17c1cb1 acc2e03 Author: Brad King AuthorDate: Thu Nov 3 08:54:56 2016 -0400 Commit: Brad King CommitDate: Thu Nov 3 08:54:56 2016 -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.7.0-rc2-436-g90e09fb
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 90e09fb958e761b416863052ca5408ed4280443b (commit) via b902f2a98a6764857f74608250219186f262a207 (commit) from ffe78961ada28f3777066228b4e5870889b42f70 (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=90e09fb958e761b416863052ca5408ed4280443b commit 90e09fb958e761b416863052ca5408ed4280443b Merge: ffe7896 b902f2a Author: Brad King AuthorDate: Thu Nov 3 08:54:28 2016 -0400 Commit: CMake Topic Stage CommitDate: Thu Nov 3 08:54:28 2016 -0400 Merge topic 'intel-compile-features-windows' b902f2a9 Features: Fix Intel cxx_attributes existence condition --- Summary of changes: Modules/Compiler/Intel-CXX-FeatureTests.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.0-rc2-914-g17c1cb1
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 17c1cb103036976fed9b4b476654821629c177a0 (commit)
via b902f2a98a6764857f74608250219186f262a207 (commit)
from efb416046626b3c9332dde3a2e20ace755d58b9a (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=17c1cb103036976fed9b4b476654821629c177a0
commit 17c1cb103036976fed9b4b476654821629c177a0
Merge: efb4160 b902f2a
Author: Brad King
AuthorDate: Thu Nov 3 08:51:01 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Nov 3 08:51:01 2016 -0400
Merge topic 'intel-compile-features-windows' into next
b902f2a9 Features: Fix Intel cxx_attributes existence condition
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b902f2a98a6764857f74608250219186f262a207
commit b902f2a98a6764857f74608250219186f262a207
Author: Brad King
AuthorDate: Thu Nov 3 08:38:23 2016 -0400
Commit: Brad King
CommitDate: Thu Nov 3 08:38:23 2016 -0400
Features: Fix Intel cxx_attributes existence condition
This condition needs to follow the same pattern added in note `[1]` by
commit a5a3642f (Features: Port Intel CXX features to test macros where
possible, 2016-10-26). It was accidentally left out of that commit.
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
index 5b74fab..d1a3433 100644
--- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake
@@ -88,7 +88,7 @@ set(_cmake_feature_test_cxx_variadic_templates
"(__cpp_variadic_templates >= 200
set(_cmake_feature_test_cxx_alias_templates "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_nullptr "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_trailing_return_types "${Intel121_CXX11}")
-set(_cmake_feature_test_cxx_attributes "__cpp_attributes >= 200809 ||
${Intel121}")
+set(_cmake_feature_test_cxx_attributes "(__cpp_attributes >= 200809 ||
${Intel121}) && ${DETECT_CXX11}") # [1]
set(_cmake_feature_test_cxx_default_function_template_args "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel121_CXX11}")
set(_cmake_feature_test_cxx_rvalue_references "(__cpp_rvalue_references >=
200610 || ${Intel121}) && ${DETECT_CXX11}") # [1]
---
Summary of changes:
Modules/Compiler/Intel-CXX-FeatureTests.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.0-rc2-912-gefb4160
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 efb416046626b3c9332dde3a2e20ace755d58b9a (commit)
via 47392375887e09e6e69ce178f870f9ca9e639298 (commit)
from d44f19273550c193ef643db5fc9ac6aff13ce85b (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=efb416046626b3c9332dde3a2e20ace755d58b9a
commit efb416046626b3c9332dde3a2e20ace755d58b9a
Merge: d44f192 4739237
Author: Brad King
AuthorDate: Thu Nov 3 08:14:23 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Nov 3 08:14:23 2016 -0400
Merge topic 'cpackifw-search-algorithm' into next
47392375 CPackIFW: Updated search algorithm
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47392375887e09e6e69ce178f870f9ca9e639298
commit 47392375887e09e6e69ce178f870f9ca9e639298
Author: Konstantin Podsvirov
AuthorDate: Wed Nov 2 23:15:07 2016 +0300
Commit: Konstantin Podsvirov
CommitDate: Wed Nov 2 23:15:07 2016 +0300
CPackIFW: Updated search algorithm
Improviments:
- Look for QtIFW distributed with QtSDK;
- Do not give a reason for the CMP0007 warning.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 6c93ddb..08078cb 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -433,11 +433,15 @@
# Default path
-set(_CPACK_IFW_PATHS
- "${QTIFWDIR}"
- "$ENV{QTIFWDIR}"
- "${QTDIR}"
- "$ENV{QTIFWDIR}")
+foreach(_CPACK_IFW_PATH_VAR "QTIFWDIR" "QTDIR")
+ if(DEFINED ${_CPACK_IFW_PATH_VAR}
+AND NOT "${${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+list(APPEND _CPACK_IFW_PATHS "${${_CPACK_IFW_PATH_VAR}}")
+ endif()
+ if(NOT "$ENV{${_CPACK_IFW_PATH_VAR}}" STREQUAL "")
+list(APPEND _CPACK_IFW_PATHS "$ENV{${_CPACK_IFW_PATH_VAR}}")
+ endif()
+endforeach()
if(WIN32)
list(APPEND _CPACK_IFW_PATHS
"$ENV{HOMEDRIVE}/Qt"
@@ -447,22 +451,44 @@ else()
"$ENV{HOME}/Qt"
"/opt/Qt")
endif()
-
-set(_CPACK_IFW_SUFFIXES
-# Common
- "bin"
-# Second branch
- "QtIFW2.3.0/bin"
- "QtIFW2.2.0/bin"
- "QtIFW2.1.0/bin"
- "QtIFW2.0.3/bin"
- "QtIFW2.0.1/bin"
- "QtIFW2.0.0/bin"
-# First branch
- "QtIFW-1.6.0/bin"
- "QtIFW-1.5.0/bin"
- "QtIFW-1.4.0/bin"
- "QtIFW-1.3.0/bin")
+list(REMOVE_DUPLICATES _CPACK_IFW_PATHS)
+
+set(_CPACK_IFW_PREFIXES
+ # QtSDK
+ "Tools/QtInstallerFramework/"
+ # Second branch
+ "QtIFW"
+ # First branch
+ "QtIFW-")
+
+set(_CPACK_IFW_VERSIONS
+ "2.3"
+ "2.3.0"
+ "2.2"
+ "2.2.0"
+ "2.1"
+ "2.1.0"
+ "2.0"
+ "2.0.3"
+ "2.0.2"
+ "2.0.1"
+ "2.0.0"
+ "1.6"
+ "1.6.0"
+ "1.5"
+ "1.5.0"
+ "1.4"
+ "1.4.0"
+ "1.3"
+ "1.3.0")
+
+set(_CPACK_IFW_SUFFIXES "bin")
+foreach(_CPACK_IFW_PREFIX ${_CPACK_IFW_PREFIXES})
+ foreach(_CPACK_IFW_VERSION ${_CPACK_IFW_VERSIONS})
+list(APPEND
+ _CPACK_IFW_SUFFIXES "${_CPACK_IFW_PREFIX}${_CPACK_IFW_VERSION}/bin")
+ endforeach()
+endforeach()
# Look for 'binarycreator'
---
Summary of changes:
Modules/CPackIFW.cmake | 68 +---
1 file changed, 47 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
