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 0e2e3e0f9f8ae6e57da0c914774cea7a40515e1f (commit)
via a21bccfd304f3cce0fe3d791593dcfaa191937d9 (commit)
via e4193adf297f493a88958821b5e926677c9c985a (commit)
via b15dbdfce856da10d3c617e109c1e3fae9ef7aee (commit)
via 055a782b8a6d43492f97572a02883b7120ac3736 (commit)
via 601fe84bd175507b164d9a4a5ad938ed8ec3f7ec (commit)
via 98164b707f4024c4c2b2a6f31c7d4e51eb53a9d4 (commit)
via 993fe2b4af0a4d8eecf519abb24c954528408dae (commit)
via 5412d6371486ba903474869ed4fad279988f6163 (commit)
via 3a82ef78eb8895016e57758c5ee943270024dbeb (commit)
from 89dc04af1d55a343a44e7c2de4bb92a101dd6138 (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=0e2e3e0f9f8ae6e57da0c914774cea7a40515e1f
commit 0e2e3e0f9f8ae6e57da0c914774cea7a40515e1f
Merge: a21bccf 055a782
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 11:40:55 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 11:40:55 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a21bccfd304f3cce0fe3d791593dcfaa191937d9
commit a21bccfd304f3cce0fe3d791593dcfaa191937d9
Merge: e4193ad 993fe2b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 15:39:27 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jul 30 11:39:38 2019 -0400
Merge topic 'find_more_binutils'
993fe2b4af CMakeFindBinUtils: add some more binutils
5412d63714 CMakeFindBinUtils: add missing llvm alternatives
3a82ef78eb CMakeFindBinUtils: Rename and unset variables for additional
names
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3584
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4193adf297f493a88958821b5e926677c9c985a
commit e4193adf297f493a88958821b5e926677c9c985a
Merge: b15dbdf 601fe84
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 15:38:05 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jul 30 11:38:35 2019 -0400
Merge topic 'swift-with-interface-libs'
601fe84bd1 Swift: Restore support for enabling with INTERFACE libraries
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Wanderley Guimarães da Silva <wanderley.guimar...@gmail.com>
Acked-by: Guillaume Egles <geg...@gmail.com>
Merge-request: !3624
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b15dbdfce856da10d3c617e109c1e3fae9ef7aee
commit b15dbdfce856da10d3c617e109c1e3fae9ef7aee
Merge: 89dc04a 98164b7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 15:37:26 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jul 30 11:37:36 2019 -0400
Merge topic 'multipackage_tutorial_compiles'
98164b707f Tutorial: MultiPackage now correctly compiles
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3594
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98164b707f4024c4c2b2a6f31c7d4e51eb53a9d4
commit 98164b707f4024c4c2b2a6f31c7d4e51eb53a9d4
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Jul 23 13:41:00 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 25 07:34:41 2019 -0400
Tutorial: MultiPackage now correctly compiles
diff --git a/Help/guide/tutorial/MultiPackage/CMakeLists.txt
b/Help/guide/tutorial/MultiPackage/CMakeLists.txt
index 067e807..bea611c 100644
--- a/Help/guide/tutorial/MultiPackage/CMakeLists.txt
+++ b/Help/guide/tutorial/MultiPackage/CMakeLists.txt
@@ -1,19 +1,26 @@
cmake_minimum_required(VERSION 3.3)
project(Tutorial)
-# control how we mark up Debug libraries compared to Release libraries
-set(CMAKE_DEBUG_POSTFIX "-d")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+# set the version number
+set(Tutorial_VERSION_MAJOR 1)
+set(Tutorial_VERSION_MINOR 0)
# control where the static and shared libraries are built so that on windows
# we don't need to tinker with the path to run the executable
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
-# the version number.
-set(Tutorial_VERSION_MAJOR 1)
-set(Tutorial_VERSION_MINOR 0)
+if(APPLE)
+ set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+elseif(UNIX)
+ set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
+endif()
# configure a header file to pass the version number only
configure_file(
diff --git a/Help/guide/tutorial/MultiPackage/MathFunctions/CMakeLists.txt
b/Help/guide/tutorial/MultiPackage/MathFunctions/CMakeLists.txt
index 161ad64..63c0f5f 100644
--- a/Help/guide/tutorial/MultiPackage/MathFunctions/CMakeLists.txt
+++ b/Help/guide/tutorial/MultiPackage/MathFunctions/CMakeLists.txt
@@ -1,4 +1,3 @@
-
# add the library that runs
add_library(MathFunctions MathFunctions.cxx)
@@ -62,6 +61,7 @@ target_compile_definitions(MathFunctions PRIVATE
"EXPORTING_MYMATH")
set_property(TARGET MathFunctions PROPERTY VERSION "1.0.0")
set_property(TARGET MathFunctions PROPERTY SOVERSION "1")
+# install rules
install(TARGETS MathFunctions
DESTINATION lib
EXPORT MathFunctionsTargets)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993fe2b4af0a4d8eecf519abb24c954528408dae
commit 993fe2b4af0a4d8eecf519abb24c954528408dae
Author: Norbert Lange <nolang...@gmail.com>
AuthorDate: Wed Jul 24 00:16:12 2019 +0200
Commit: Norbert Lange <nolang...@gmail.com>
CommitDate: Wed Jul 24 00:16:12 2019 +0200
CMakeFindBinUtils: add some more binutils
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 3a7ac2c..773ee53 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -91,6 +91,9 @@ else()
set(_CMAKE_ADDITIONAL_NM_NAMES "llvm-nm")
set(_CMAKE_ADDITIONAL_OBJDUMP_NAMES "llvm-objdump")
set(_CMAKE_ADDITIONAL_OBJCOPY_NAMES "llvm-objcopy")
+ set(_CMAKE_ADDITIONAL_READELF_NAMES "llvm-readelf")
+ set(_CMAKE_ADDITIONAL_DLLTOOL_NAMES "llvm-dlltool")
+ set(_CMAKE_ADDITIONAL_ADDR2LINE_NAMES "llvm-addr2line")
endif()
find_program(CMAKE_AR NAMES
${_CMAKE_TOOLCHAIN_PREFIX}ar${_CMAKE_TOOLCHAIN_SUFFIX}
${_CMAKE_ADDITIONAL_AR_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
@@ -106,8 +109,11 @@ else()
find_program(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm
${_CMAKE_ADDITIONAL_NM_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump
${_CMAKE_ADDITIONAL_OBJDUMP_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy
${_CMAKE_ADDITIONAL_OBJCOPY_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_READELF NAMES ${_CMAKE_TOOLCHAIN_PREFIX}readelf
${_CMAKE_ADDITIONAL_READELF_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_DLLTOOL NAMES ${_CMAKE_TOOLCHAIN_PREFIX}dlltool
${_CMAKE_ADDITIONAL_DLLTOOL_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_ADDR2LINE NAMES ${_CMAKE_TOOLCHAIN_PREFIX}addr2line
${_CMAKE_ADDITIONAL_ADDR2LINE_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- list(APPEND _CMAKE_TOOL_VARS AR RANLIB STRIP LINKER NM OBJDUMP OBJCOPY)
+ list(APPEND _CMAKE_TOOL_VARS AR RANLIB STRIP LINKER NM OBJDUMP OBJCOPY
READELF DLLTOOL ADDR2LINE)
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5412d6371486ba903474869ed4fad279988f6163
commit 5412d6371486ba903474869ed4fad279988f6163
Author: Norbert Lange <nolang...@gmail.com>
AuthorDate: Wed Jul 24 00:06:14 2019 +0200
Commit: Norbert Lange <nolang...@gmail.com>
CommitDate: Wed Jul 24 00:06:14 2019 +0200
CMakeFindBinUtils: add missing llvm alternatives
LLVM 8.0 already ships with alternatives for all
current Binutils. Enable them.
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index db183e8..3a7ac2c 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -84,10 +84,13 @@ else()
endif()
if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL Clang)
- set(_CMAKE_ADDITIONAL_OBJDUMP_NAMES "llvm-objdump")
- set(_CMAKE_ADDITIONAL_LINKER_NAMES "ld.lld")
- set(_CMAKE_ADDITIONAL_RANLIB_NAMES "llvm-ranlib")
set(_CMAKE_ADDITIONAL_AR_NAMES "llvm-ar")
+ set(_CMAKE_ADDITIONAL_RANLIB_NAMES "llvm-ranlib")
+ set(_CMAKE_ADDITIONAL_STRIP_NAMES "llvm-strip")
+ set(_CMAKE_ADDITIONAL_LINKER_NAMES "ld.lld")
+ set(_CMAKE_ADDITIONAL_NM_NAMES "llvm-nm")
+ set(_CMAKE_ADDITIONAL_OBJDUMP_NAMES "llvm-objdump")
+ set(_CMAKE_ADDITIONAL_OBJCOPY_NAMES "llvm-objcopy")
endif()
find_program(CMAKE_AR NAMES
${_CMAKE_TOOLCHAIN_PREFIX}ar${_CMAKE_TOOLCHAIN_SUFFIX}
${_CMAKE_ADDITIONAL_AR_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
@@ -98,11 +101,11 @@ else()
endif()
- find_program(CMAKE_STRIP NAMES
${_CMAKE_TOOLCHAIN_PREFIX}strip${_CMAKE_TOOLCHAIN_SUFFIX} HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_STRIP NAMES
${_CMAKE_TOOLCHAIN_PREFIX}strip${_CMAKE_TOOLCHAIN_SUFFIX}
${_CMAKE_ADDITIONAL_STRIP_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld
${_CMAKE_ADDITIONAL_LINKER_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- find_program(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm
${_CMAKE_ADDITIONAL_NM_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump
${_CMAKE_ADDITIONAL_OBJDUMP_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- find_program(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy
${_CMAKE_ADDITIONAL_OBJCOPY_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
list(APPEND _CMAKE_TOOL_VARS AR RANLIB STRIP LINKER NM OBJDUMP OBJCOPY)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a82ef78eb8895016e57758c5ee943270024dbeb
commit 3a82ef78eb8895016e57758c5ee943270024dbeb
Author: Norbert Lange <nolang...@gmail.com>
AuthorDate: Tue Jul 23 23:57:45 2019 +0200
Commit: Norbert Lange <nolang...@gmail.com>
CommitDate: Tue Jul 23 23:57:45 2019 +0200
CMakeFindBinUtils: Rename and unset variables for additional names
use the name pattern `_CMAKE_ADDITIONAL_<PROGRAM_NAME>_NAMES`,
and unset those variables at the end of the function
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 0e84116..db183e8 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -72,7 +72,7 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}"
STREQUAL "xMSVC" AND
find_program(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_MT NAMES mt HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- list(APPEND _CMAKE_TOOL_VARS CMAKE_LINKER CMAKE_MT)
+ list(APPEND _CMAKE_TOOL_VARS LINKER MT)
# in all other cases search for ar, ranlib, etc.
else()
@@ -84,27 +84,27 @@ else()
endif()
if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL Clang)
- set(LLVM_OBJDUMP "llvm-objdump")
- set(LLVM_LLD "ld.lld")
- set(LLVM_RANLIB "llvm-ranlib")
- set(LLVM_AR "llvm-ar")
+ set(_CMAKE_ADDITIONAL_OBJDUMP_NAMES "llvm-objdump")
+ set(_CMAKE_ADDITIONAL_LINKER_NAMES "ld.lld")
+ set(_CMAKE_ADDITIONAL_RANLIB_NAMES "llvm-ranlib")
+ set(_CMAKE_ADDITIONAL_AR_NAMES "llvm-ar")
endif()
- find_program(CMAKE_AR NAMES
${_CMAKE_TOOLCHAIN_PREFIX}ar${_CMAKE_TOOLCHAIN_SUFFIX} ${LLVM_AR} HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_AR NAMES
${_CMAKE_TOOLCHAIN_PREFIX}ar${_CMAKE_TOOLCHAIN_SUFFIX}
${_CMAKE_ADDITIONAL_AR_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
- find_program(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib
${LLVM_RANLIB} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib
${_CMAKE_ADDITIONAL_RANLIB_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
if(NOT CMAKE_RANLIB)
set(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
endif()
find_program(CMAKE_STRIP NAMES
${_CMAKE_TOOLCHAIN_PREFIX}strip${_CMAKE_TOOLCHAIN_SUFFIX} HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
- find_program(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld ${LLVM_LLD}
HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld
${_CMAKE_ADDITIONAL_LINKER_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_NM NAMES ${_CMAKE_TOOLCHAIN_PREFIX}nm HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
- find_program(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump
${LLVM_OBJDUMP} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ find_program(CMAKE_OBJDUMP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objdump
${_CMAKE_ADDITIONAL_OBJDUMP_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
find_program(CMAKE_OBJCOPY NAMES ${_CMAKE_TOOLCHAIN_PREFIX}objcopy HINTS
${_CMAKE_TOOLCHAIN_LOCATION})
- list(APPEND _CMAKE_TOOL_VARS CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER
CMAKE_NM CMAKE_OBJDUMP CMAKE_OBJCOPY)
+ list(APPEND _CMAKE_TOOL_VARS AR RANLIB STRIP LINKER NM OBJDUMP OBJCOPY)
endif()
@@ -115,15 +115,16 @@ if(CMAKE_PLATFORM_HAS_INSTALLNAME)
message(FATAL_ERROR "Could not find install_name_tool, please check your
installation.")
endif()
- list(APPEND _CMAKE_TOOL_VARS CMAKE_INSTALL_NAME_TOOL)
+ list(APPEND _CMAKE_TOOL_VARS INSTALL_NAME_TOOL)
endif()
# Mark any tool cache entries as advanced.
foreach(var IN LISTS _CMAKE_TOOL_VARS)
- get_property(_CMAKE_TOOL_CACHED CACHE ${var} PROPERTY TYPE)
+ get_property(_CMAKE_TOOL_CACHED CACHE CMAKE_${var} PROPERTY TYPE)
if(_CMAKE_TOOL_CACHED)
- mark_as_advanced(${var})
+ mark_as_advanced(CMAKE_${var})
endif()
+ unset(_CMAKE_ADDITIONAL_${var}_NAMES)
endforeach()
unset(_CMAKE_TOOL_VARS)
unset(_CMAKE_TOOL_CACHED)
-----------------------------------------------------------------------
Summary of changes:
Help/guide/tutorial/MultiPackage/CMakeLists.txt | 17 ++++++---
.../MultiPackage/MathFunctions/CMakeLists.txt | 2 +-
Modules/CMakeFindBinUtils.cmake | 42 +++++++++++++---------
Source/cmGlobalGenerator.cxx | 17 ++++-----
Tests/SwiftOnly/CMakeLists.txt | 3 ++
5 files changed, 51 insertions(+), 30 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
