[Cmake-commits] CMake branch, master, updated. v3.9.1-456-ge4f16a0
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 e4f16a06ab1cf0ded2e2dd484206ec57d8f60594 (commit) from c47c011c77bfd1bfb8d2060511a2b957ce181c62 (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=e4f16a06ab1cf0ded2e2dd484206ec57d8f60594 commit e4f16a06ab1cf0ded2e2dd484206ec57d8f60594 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sat Aug 12 00:01:12 2017 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sat Aug 12 00:01:12 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7f35a7a..0bbb218 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 9) -set(CMake_VERSION_PATCH 20170811) +set(CMake_VERSION_PATCH 20170812) #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.9.1-455-gc47c011
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 c47c011c77bfd1bfb8d2060511a2b957ce181c62 (commit) via 7983e068e176a0e3cffb3794d9665fb862614158 (commit) from 73657a35e6f64e530e8bbda90757c3762d7c36c6 (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=c47c011c77bfd1bfb8d2060511a2b957ce181c62 commit c47c011c77bfd1bfb8d2060511a2b957ce181c62 Merge: 73657a3 7983e06 Author: Brad KingAuthorDate: Fri Aug 11 13:51:45 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:51:54 2017 -0400 Merge topic 'github-pr-template' 7983e068 Add GitHub PR template to point contributors at CONTRIBUTING.rst Acked-by: Kitware Robot Reviewed-by: Ben Boeckel Reviewed-by: Craig Scott Merge-request: !1125 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7983e068e176a0e3cffb3794d9665fb862614158 commit 7983e068e176a0e3cffb3794d9665fb862614158 Author: Brad King AuthorDate: Thu Aug 10 09:56:41 2017 -0400 Commit: Brad King CommitDate: Fri Aug 11 08:23:09 2017 -0400 Add GitHub PR template to point contributors at CONTRIBUTING.rst GitHub's link to the contribution guidelines in `CONTRIBUTING.rst` is not prominent enough to be reliably noticed and followed by new contributors. Add a PR template to make the link more visible. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000..d934bf9 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,7 @@ +Thanks for your interest in contributing to CMake! The GitHub repository +is a mirror provided for convenience, but CMake does not use GitHub pull +requests for contribution. Please see + + https://gitlab.kitware.com/cmake/cmake/tree/master/CONTRIBUTING.rst + +for contribution instructions. GitHub OAuth may be used to sign in. --- Summary of changes: .github/pull_request_template.md |7 +++ 1 file changed, 7 insertions(+) create mode 100644 .github/pull_request_template.md 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.9.1-453-g73657a3
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 73657a35e6f64e530e8bbda90757c3762d7c36c6 (commit) via 88c9878af9d6d4b8cd3c7358bfdd12206c8aadb4 (commit) from 1d51fcaeafeb9bfcdf3bc871d2b875446df081e8 (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=73657a35e6f64e530e8bbda90757c3762d7c36c6 commit 73657a35e6f64e530e8bbda90757c3762d7c36c6 Merge: 1d51fca 88c9878 Author: Brad KingAuthorDate: Fri Aug 11 13:16:59 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:17:04 2017 -0400 Merge topic 'libuv-required' 88c9878a Make libuv available to all parts of CMake Acked-by: Kitware Robot Merge-request: !1104 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88c9878af9d6d4b8cd3c7358bfdd12206c8aadb4 commit 88c9878af9d6d4b8cd3c7358bfdd12206c8aadb4 Author: Brad King AuthorDate: Thu Aug 3 14:47:49 2017 -0400 Commit: Brad King CommitDate: Tue Aug 8 09:34:54 2017 -0400 Make libuv available to all parts of CMake The libuv library provides many useful platform abstractions and better process management than KWSys. We'd like to use it everywhere instead of just in the server mode. Drop the `CMAKE_USE_LIBUV` option and use libuv everywhere except during bootstrap. diff --git a/CMakeLists.txt b/CMakeLists.txt index 831e25f..e60dc78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,42 +529,21 @@ macro (CMAKE_BUILD_UTILITIES) #- # Build libuv library. - if(NOT DEFINED CMAKE_USE_LIBUV) -set(CMAKE_USE_LIBUV 1) -if(APPLE) - include(CheckCSourceCompiles) - check_c_source_compiles(" -#include -#include -#ifndef MAC_OS_X_VERSION_10_5 -#error \"MAC_OS_X_VERSION_10_5 is not defined\" -#endif -int main(void) { return 0; } -" HAVE_CoreServices_OS_X_10_5) - if(NOT HAVE_CoreServices_OS_X_10_5) -set(CMAKE_USE_LIBUV 0) - endif() -endif() - endif() - if(CMAKE_USE_LIBUV) -if(CMAKE_USE_SYSTEM_LIBUV) - if(NOT CMAKE_VERSION VERSION_LESS 3.0) -find_package(LibUV 1.0.0) - else() -message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0") - endif() - if(NOT LIBUV_FOUND) -message(FATAL_ERROR - "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") - endif() - set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV) + if(CMAKE_USE_SYSTEM_LIBUV) +if(NOT CMAKE_VERSION VERSION_LESS 3.0) + find_package(LibUV 1.0.0) else() - set(CMAKE_LIBUV_LIBRARIES cmlibuv) - add_subdirectory(Utilities/cmlibuv) - CMAKE_SET_TARGET_FOLDER(cmlibuv "Utilities/3rdParty") + message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0") endif() +if(NOT LIBUV_FOUND) + message(FATAL_ERROR +"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") +endif() +set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV) else() -set(CMAKE_LIBUV_LIBRARIES) +set(CMAKE_LIBUV_LIBRARIES cmlibuv) +add_subdirectory(Utilities/cmlibuv) +CMAKE_SET_TARGET_FOLDER(cmlibuv "Utilities/3rdParty") endif() #- @@ -758,8 +737,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) if(NOT DEFINED CMake_ENABLE_SERVER_MODE) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR) -if(CMAKE_USE_LIBUV -AND CMake_HAVE_CXX_AUTO_TYPE +if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_MAKE_UNIQUE AND CMake_HAVE_CXX_RANGE_FOR ) @@ -768,9 +746,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) set(CMake_ENABLE_SERVER_MODE 0) endif() endif() - if(CMake_ENABLE_SERVER_MODE AND NOT CMAKE_USE_LIBUV) -message(FATAL_ERROR "The server mode requires libuv!") - endif() else() set(CMake_ENABLE_SERVER_MODE 0) endif() diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 524fdf8..302000a 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -19,7 +19,6 @@ #cmakedefine HAVE_UNSETENV #cmakedefine CMAKE_USE_ELF_PARSER #cmakedefine CMAKE_USE_MACH_PARSER -#cmakedefine CMAKE_USE_LIBUV #cmakedefine CMake_HAVE_CXX_AUTO_PTR #cmakedefine CMake_HAVE_CXX_EQ_DELETE #cmakedefine CMake_HAVE_CXX_FALLTHROUGH diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index c5a6836..dd88083 100644 ---
[Cmake-commits] CMake branch, master, updated. v3.9.1-451-g1d51fca
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 1d51fcaeafeb9bfcdf3bc871d2b875446df081e8 (commit) via 0baf114a35f061ac27f44c9d4716b2f30a1533c6 (commit) via d4b70a20fae44e802b5e07c7fa18b81808263f77 (commit) via 485cbd456aae395da1661b08161751c3c3b47a96 (commit) via eda45e9f17cdc401c6450d0e8eca65e5b068330f (commit) via 15ef27286ade97a49f6832254d3451755a824fb8 (commit) via 362f9bd755c7b964184db38d1fb2217ded70af63 (commit) via 952fc65d140a1b36fc2e580d7ca89de231a04412 (commit) via cbf1393aa4b957ec3c2c5cc4852dcebab825c5b6 (commit) via ae813b6bcc64fc5096fb4a7d87920b47cfbe488f (commit) via d9c8aa47c2e7a2f97def22847a76c3cfcba74f01 (commit) via 4f7d9eef51da4a72fd7c7a17bcbbcf83ffad3216 (commit) from f8a61c578badb0015423580b38341bc00a3c7fd4 (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=1d51fcaeafeb9bfcdf3bc871d2b875446df081e8 commit 1d51fcaeafeb9bfcdf3bc871d2b875446df081e8 Merge: 0baf114 15ef272 Author: Brad KingAuthorDate: Fri Aug 11 13:14:36 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:14:40 2017 -0400 Merge topic 'autogen-merge-redundant' 15ef2728 Autogen: Add test for OBJECT libraries 362f9bd7 Autogen: Merge and remove redundant function calls 952fc65d Autogen: Clear sources meta data cache Acked-by: Kitware Robot Merge-request: !1120 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0baf114a35f061ac27f44c9d4716b2f30a1533c6 commit 0baf114a35f061ac27f44c9d4716b2f30a1533c6 Merge: d4b70a2 4f7d9ee Author: Brad King AuthorDate: Fri Aug 11 13:13:36 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:13:39 2017 -0400 Merge topic 'genex-COMPILE_FEATURES-stds' 4f7d9eef Features: Fix COMPILE_FEATURES genex for C++ 14 and 17 features Acked-by: Kitware Robot Merge-request: !1118 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4b70a20fae44e802b5e07c7fa18b81808263f77 commit d4b70a20fae44e802b5e07c7fa18b81808263f77 Merge: 485cbd4 ae813b6 Author: Brad King AuthorDate: Fri Aug 11 13:12:23 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:12:37 2017 -0400 Merge topic 'FindCUDA-superseded' ae813b6b FindCUDA: Document that module has been superseded Acked-by: Kitware Robot Merge-request: !1124 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=485cbd456aae395da1661b08161751c3c3b47a96 commit 485cbd456aae395da1661b08161751c3c3b47a96 Merge: eda45e9 d9c8aa4 Author: Brad King AuthorDate: Fri Aug 11 13:12:15 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:12:18 2017 -0400 Merge topic 'findcuda_dont_ignore_CUDA_USE_STATIC_CUDA_RUNTIME' d9c8aa47 FindCUDA: Always obey the CUDA_USE_STATIC_CUDA_RUNTIME option. Acked-by: Kitware Robot Merge-request: !1123 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda45e9f17cdc401c6450d0e8eca65e5b068330f commit eda45e9f17cdc401c6450d0e8eca65e5b068330f Merge: f8a61c5 cbf1393 Author: Brad King AuthorDate: Fri Aug 11 13:11:37 2017 + Commit: Kitware Robot CommitDate: Fri Aug 11 09:11:43 2017 -0400 Merge topic 'FindCUDA-cuda9' cbf1393a FindCUDA: Add CUDA9/Volta recognition Acked-by: Kitware Robot Reviewed-by: Robert Maynard Merge-request: !1119 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15ef27286ade97a49f6832254d3451755a824fb8 commit 15ef27286ade97a49f6832254d3451755a824fb8 Author: Sebastian Holtermann AuthorDate: Thu Aug 10 19:16:16 2017 +0200 Commit: Sebastian Holtermann CommitDate: Thu Aug 10 23:15:48 2017 +0200 Autogen: Add test for OBJECT libraries diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 5064d26..198bf63 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -193,5 +193,9 @@ endif() add_subdirectory(uicInclude) # -- Test +# OBJECT libraries +add_subdirectory(objectLibrary) + +# -- Test # Complex test case add_subdirectory(complex) diff --git a/Tests/QtAutogen/objectLibrary/CMakeLists.txt b/Tests/QtAutogen/objectLibrary/CMakeLists.txt new file mode 100644 index