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 57fc6c587ad766135f9f2b62a870374e9251281c (commit)
via bd4d52f7ded45d82781294b2374a1b845cbbb020 (commit)
via 3186bb91ed10db071c2ceb401a05db5b35b67faa (commit)
via 18365587c86396f988e256b5acf4d2312f3be2bb (commit)
from 613ac3e7d526d3874176e2b70eba342836a9b6b5 (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=57fc6c587ad766135f9f2b62a870374e9251281c
commit 57fc6c587ad766135f9f2b62a870374e9251281c
Merge: bd4d52f 3186bb9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 27 15:00:43 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Aug 27 11:00:53 2019 -0400
Merge topic 'xcode11-compatibility'
3186bb91ed Xcode: Make iOS tests compatible with Xcode 11
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3743
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4d52f7ded45d82781294b2374a1b845cbbb020
commit bd4d52f7ded45d82781294b2374a1b845cbbb020
Merge: 613ac3e 1836558
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 27 14:57:59 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Aug 27 10:58:28 2019 -0400
Merge topic 'GNUInstallDirs-arch-linux'
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based
systems
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3735
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3186bb91ed10db071c2ceb401a05db5b35b67faa
commit 3186bb91ed10db071c2ceb401a05db5b35b67faa
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Mon Aug 26 19:51:26 2019 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Mon Aug 26 21:08:00 2019 +0200
Xcode: Make iOS tests compatible with Xcode 11
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index ef772ea..8c0b470 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -5,6 +5,7 @@ enable_language(C)
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
index f6c00b1..c221033 100644
--- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
@@ -11,6 +11,7 @@ if(NOT IOS)
endif()
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake
b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake
index ec11dbb..172f2e8 100644
--- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake
@@ -7,6 +7,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
endif()
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
add_library(foo SHARED foo.cpp)
diff --git
a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake
b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake
index 58e96b4..038a890 100644
--- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake
@@ -7,6 +7,7 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
endif()
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
add_library(foo SHARED foo.cpp)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18365587c86396f988e256b5acf4d2312f3be2bb
commit 18365587c86396f988e256b5acf4d2312f3be2bb
Author: Antonio Rojas <aro...@archlinux.org>
AuthorDate: Sun Aug 25 04:46:24 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Aug 26 11:14:13 2019 -0400
GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems
Fixes: #15373
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 4db4e18..f95e6e2 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -222,7 +222,8 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
# updated to the new default, unless the user explicitly changed it.
endif()
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
- AND NOT CMAKE_CROSSCOMPILING)
+ AND NOT CMAKE_CROSSCOMPILING
+ AND NOT EXISTS "/etc/arch-release")
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)
if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-----------------------------------------------------------------------
Summary of changes:
Modules/GNUInstallDirs.cmake | 3 ++-
Tests/RunCMake/XcodeProject/XcodeBundles.cmake | 1 +
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake | 1 +
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake | 1 +
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedSingleArch.cmake | 1 +
5 files changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
