[Cmake-commits] CMake branch, master, updated. v3.11.0-rc1-67-gfef0018
Kitware Robot
kwrobot at kitware.com
Wed Feb 21 10:45:04 EST 2018
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 fef001884f28bf2e3d6159bb0c8ef4ed2253f2e9 (commit)
via fcae625f48856883e9dd3733d87c5d1703ad011c (commit)
via 283562624c6a29ce0bad9beca81571f4691ca29d (commit)
via e936b6bb5a7e930ac030645a412021383be408d7 (commit)
via 6cced7872557fe92228114ce6bf55a30ef91e358 (commit)
via 67db3ff958302d09dca208ff54c699beb4a9d13d (commit)
from 4e6f94d49ca591ff90ead5f00df71b22f97241e6 (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=fef001884f28bf2e3d6159bb0c8ef4ed2253f2e9
commit fef001884f28bf2e3d6159bb0c8ef4ed2253f2e9
Merge: fcae625 6cced78
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 21 15:43:49 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 21 10:44:08 2018 -0500
Merge topic 'FindLua-tolerate-var'
6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1778
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcae625f48856883e9dd3733d87c5d1703ad011c
commit fcae625f48856883e9dd3733d87c5d1703ad011c
Merge: 2835626 67db3ff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 21 15:43:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 21 10:43:40 2018 -0500
Merge topic 'FindwxWidget/fix-eating-minusL-in-path'
67db3ff9 Fix eating "-L" in path names
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1775
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=283562624c6a29ce0bad9beca81571f4691ca29d
commit 283562624c6a29ce0bad9beca81571f4691ca29d
Merge: 4e6f94d e936b6b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 21 15:43:03 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 21 10:43:09 2018 -0500
Merge topic 'find-linker'
e936b6bb CMakeFindBinUtils: Find linker in PATH
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1720
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e936b6bb5a7e930ac030645a412021383be408d7
commit e936b6bb5a7e930ac030645a412021383be408d7
Author: xoviat <xoviat at users.noreply.github.com>
AuthorDate: Tue Jan 30 13:41:16 2018 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 21 10:42:15 2018 -0500
CMakeFindBinUtils: Find linker in PATH
Fixes: #17693
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index ece0547..1b6823c 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -19,6 +19,25 @@
# on UNIX, cygwin and mingw
+if(CMAKE_LINKER)
+ # we only get here if CMAKE_LINKER was specified using -D or a pre-made CMakeCache.txt
+ # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
+ # find the linker in the PATH if necessary
+ get_filename_component(_CMAKE_USER_LINKER_PATH "${CMAKE_LINKER}" PATH)
+ if(NOT _CMAKE_USER_LINKER_PATH)
+ find_program(CMAKE_LINKER_WITH_PATH NAMES ${CMAKE_LINKER} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+ if(CMAKE_LINKER_WITH_PATH)
+ set(CMAKE_LINKER ${CMAKE_LINKER_WITH_PATH})
+ get_property(_CMAKE_LINKER_CACHED CACHE CMAKE_LINKER PROPERTY TYPE)
+ if(_CMAKE_LINKER_CACHED)
+ set(CMAKE_LINKER "${CMAKE_LINKER}" CACHE STRING "Default Linker" FORCE)
+ endif()
+ unset(_CMAKE_LINKER_CACHED)
+ endif()
+ unset(CMAKE_LINKER_WITH_PATH CACHE)
+ endif()
+endif()
+
# if it's the MS C/CXX compiler, search for link
if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC"
OR "x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xMSVC"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cced7872557fe92228114ce6bf55a30ef91e358
commit 6cced7872557fe92228114ce6bf55a30ef91e358
Author: Frank Benkstein <frank at benkstein.net>
AuthorDate: Mon Feb 19 17:50:16 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 20 16:13:45 2018 -0500
FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path`
call and unset the cache entry before each use. Unset a plain variable
of this name too in case it was set by project code. Otherwise the
`find_path` call may be skipped and the wrong value used, leading to
errors.
diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index b59b9b3..7eba206 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -122,6 +122,7 @@ endif ()
if (NOT LUA_VERSION_STRING)
foreach (subdir IN LISTS _lua_include_subdirs)
unset(LUA_INCLUDE_PREFIX CACHE)
+ unset(LUA_INCLUDE_PREFIX)
find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
HINTS
ENV LUA_DIR
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67db3ff958302d09dca208ff54c699beb4a9d13d
commit 67db3ff958302d09dca208ff54c699beb4a9d13d
Author: Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Sat Feb 17 16:15:57 2018 +0100
Commit: Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
CommitDate: Sat Feb 17 16:15:57 2018 +0100
Fix eating "-L" in path names
When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...)
replaces the content and results in a wrong path. The regex fixes this.
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index e21ec38..965948e 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -837,7 +837,7 @@ else()
# extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
string(REGEX MATCHALL "-L[^;]+"
wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
- string(REPLACE "-L" ""
+ string(REGEX REPLACE "-L([^;]+)" "\\1"
wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFindBinUtils.cmake | 19 +++++++++++++++++++
Modules/FindLua.cmake | 1 +
Modules/FindwxWidgets.cmake | 2 +-
3 files changed, 21 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list