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 38db92f6686694157ebec44d361b29ede44e0b5e (commit)
via aa8fe65cd7cf5bcea9ddd8fc9ea7801dd720a7eb (commit)
via 683e1290907278b02c8940e710367d25a5f4870b (commit)
via da1f5336962b5f34dddd95c11ca7f774cea7d99e (commit)
via 08813b17a1500830f166d97ffed21c700de80bbb (commit)
via faa9ef9968be574427f935c3bd614b1ceb69558b (commit)
via d43c9152a6a4cbd36f3be73a23c80d818ef2bc50 (commit)
via 826bf5c45451900869ca681768d8f291311c75ca (commit)
via decfdec63fefe2d4e9628fa247e701bf1b8c4a57 (commit)
via 71f27c04b097e4fefb0ec64536c8e21161fc99b0 (commit)
via 4464ef21da99ec0d506ea1d66f959b5b11f65d0c (commit)
via df2875b58d3eaa75275842f6574dd7a5bc11e650 (commit)
via 611ad194991950ed32189d7314bdbb6cb7cc673b (commit)
via 2ba71a11e3b09fb4a9aa6a98ba3d8302fff02dc2 (commit)
via b29842a818ea978a85c0646cd3c2b3191b0498fc (commit)
via b2b3872f22a62fa7061f977004523c7fbf5fa35b (commit)
from a3371e70b786f51d8fead1d6aba2cc7cd3e30ce3 (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=38db92f6686694157ebec44d361b29ede44e0b5e
commit 38db92f6686694157ebec44d361b29ede44e0b5e
Merge: aa8fe65 df2875b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 13:02:17 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 29 09:02:28 2018 -0400
Merge topic 'FindBoost-arch-check-style'
df2875b58d FindBoost: Update MSVC architecture check code style
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2172
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa8fe65cd7cf5bcea9ddd8fc9ea7801dd720a7eb
commit aa8fe65cd7cf5bcea9ddd8fc9ea7801dd720a7eb
Merge: 683e129 611ad19
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 13:01:46 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 29 09:01:52 2018 -0400
Merge topic 'cpackrpm-cmake_command'
611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2168
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=683e1290907278b02c8940e710367d25a5f4870b
commit 683e1290907278b02c8940e710367d25a5f4870b
Merge: da1f533 d43c915
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 08:58:28 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jun 29 08:58:28 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da1f5336962b5f34dddd95c11ca7f774cea7d99e
commit da1f5336962b5f34dddd95c11ca7f774cea7d99e
Merge: 08813b1 826bf5c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 12:56:06 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 29 08:57:10 2018 -0400
Merge topic 'FindOpenMP-avoid-warning-in-check'
826bf5c454 FindOpenMP: Avoid warning in check code
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Henry Schreiner <henryschreiner...@gmail.com>
Merge-request: !2176
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08813b17a1500830f166d97ffed21c700de80bbb
commit 08813b17a1500830f166d97ffed21c700de80bbb
Merge: faa9ef9 71f27c0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 12:55:54 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 29 08:56:25 2018 -0400
Merge topic 'ctest_submit-https'
71f27c04b0 ctest_submit: show headers as debug info
4464ef21da ctest_submit: Check CA file during CDASH_UPLOAD
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2171
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faa9ef9968be574427f935c3bd614b1ceb69558b
commit faa9ef9968be574427f935c3bd614b1ceb69558b
Merge: a3371e7 b29842a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jun 29 12:55:42 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jun 29 08:55:47 2018 -0400
Merge topic 'lexer-null'
b29842a818 ListFileLexer: Do not match null bytes in input
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2174
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df2875b58d3eaa75275842f6574dd7a5bc11e650
commit df2875b58d3eaa75275842f6574dd7a5bc11e650
Author: Matt Powley <matt.pow...@renishaw.com>
AuthorDate: Tue Jun 26 12:16:03 2018 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 27 14:55:49 2018 -0400
FindBoost: Update MSVC architecture check code style
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 08d9762..1bdf5cc 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1461,14 +1461,14 @@ if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}"
STREQUAL "x" AND NOT Boost_VERSI
string(APPEND _boost_ARCHITECTURE_TAG "-")
# This needs to be kept in-sync with the section of CMakePlatformId.h.in
# inside 'defined(_WIN32) && defined(_MSC_VER)'
- if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64")
+ if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "IA64")
string(APPEND _boost_ARCHITECTURE_TAG "i")
- elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86"
- OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64")
+ elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "X86"
+ OR CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "x64")
string(APPEND _boost_ARCHITECTURE_TAG "x")
- elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM")
+ elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "^ARM")
string(APPEND _boost_ARCHITECTURE_TAG "a")
- elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS")
+ elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "MIPS")
string(APPEND _boost_ARCHITECTURE_TAG "m")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=611ad194991950ed32189d7314bdbb6cb7cc673b
commit 611ad194991950ed32189d7314bdbb6cb7cc673b
Author: Daniel Wyatt <daniel.wy...@gmail.com>
AuthorDate: Sat Jun 23 07:42:42 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 26 13:25:08 2018 -0400
CPack/RPM: Use CMAKE_COMMAND to reference cmake executable
Ensure we use the `cmake` corresponding to the running `cpack`
even if it is not first in `PATH` or has had its name changed.
This was accidentally left out in commit v3.7.0-rc1~81^2 (CPack/RPM:
Generate source rpm (SRPM) packages on demand, 2016-09-19).
diff --git a/Modules/Internal/CPack/CPackRPM.cmake
b/Modules/Internal/CPack/CPackRPM.cmake
index d044f05..06298d7 100644
--- a/Modules/Internal/CPack/CPackRPM.cmake
+++ b/Modules/Internal/CPack/CPackRPM.cmake
@@ -1525,7 +1525,7 @@ ${TMP_DEBUGINFO_ADDITIONAL_SOURCES}
%build
mkdir cpack_rpm_build_dir
cd cpack_rpm_build_dir
-cmake ${CPACK_RPM_SOURCE_PKG_BUILD_PARAMS}
-DCPACK_PACKAGING_INSTALL_PREFIX=${CPACK_RPM_SOURCE_PKG_PACKAGING_INSTALL_PREFIX}
../${CPACK_PACKAGE_FILE_NAME}
+'${CMAKE_COMMAND}' ${CPACK_RPM_SOURCE_PKG_BUILD_PARAMS}
-DCPACK_PACKAGING_INSTALL_PREFIX=${CPACK_RPM_SOURCE_PKG_PACKAGING_INSTALL_PREFIX}
../${CPACK_PACKAGE_FILE_NAME}
make %{?_smp_mflags}" # %{?_smp_mflags} -> -j option
)
set(TMP_RPM_INSTALL
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 10 +-
Modules/FindOpenMP.cmake | 2 +-
Modules/Internal/CPack/CPackRPM.cmake | 2 +-
Source/CTest/cmCTestCurl.cxx | 6 +-
Source/CTest/cmCTestSubmitHandler.cxx | 2 +-
Source/LexerParser/cmListFileLexer.c | 196 ++++++++++-----------
Source/LexerParser/cmListFileLexer.in.l | 6 +-
.../NullAfterBackslash-result.txt} | 0
...nt-stderr.txt => NullAfterBackslash-stderr.txt} | 4 +-
Tests/RunCMake/Syntax/NullAfterBackslash.cmake | Bin 0 -> 113 bytes
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 1 +
.../ctest_submit/CDashSubmitHeaders-stderr.txt | 2 -
Tests/RunCMake/ctest_submit/RunCMakeTest.cmake | 13 +-
13 files changed, 123 insertions(+), 121 deletions(-)
copy Tests/RunCMake/{while/MissingArgument-result.txt =>
Syntax/NullAfterBackslash-result.txt} (100%)
copy Tests/RunCMake/Syntax/{NullTerminatedArgument-stderr.txt =>
NullAfterBackslash-stderr.txt} (69%)
create mode 100644 Tests/RunCMake/Syntax/NullAfterBackslash.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
