[Cmake-commits] CMake branch, master, updated. v3.10.0-rc1-94-g7e69e08
Kitware Robot
kwrobot at kitware.com
Thu Oct 12 09:25:12 EDT 2017
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 7e69e0851033bf9ebec398979236b1868d7667a7 (commit)
via 8df52df84d04d8faa50ce940358845ff67fdc3e1 (commit)
via 0d508b1ee1841aaf899c4cb32fb913b42358776c (commit)
via 016daf0391f8f4bfda1d42b7c86516acca1f0b2b (commit)
via f618142fb98db669e0e34de7b475819b241f2d0b (commit)
via e7720a0f3f695b55b876689180e32d6c2fc5343c (commit)
via 192ab741ec65c96945893367bd3d04c08ca0f47a (commit)
via 3976a1066afc89e23f4f7be2040c1e7835324f03 (commit)
via b1aa8a4773da5fb4e0d4ee9b7fd224ed9bdbba31 (commit)
via 609a6fe96d9dc39ee80a5504be34570c09f62cca (commit)
via b6d3a1c09a796ec0c29074c387953fb88ebfe874 (commit)
from add1ba92f716121830d91dc136e9eb0096ec9e53 (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=7e69e0851033bf9ebec398979236b1868d7667a7
commit 7e69e0851033bf9ebec398979236b1868d7667a7
Merge: 8df52df f618142
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 12 09:24:06 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 12 09:24:06 2017 -0400
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8df52df84d04d8faa50ce940358845ff67fdc3e1
commit 8df52df84d04d8faa50ce940358845ff67fdc3e1
Merge: 0d508b1 192ab74
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 12 13:19:57 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 12 09:20:09 2017 -0400
Merge topic 'FindPythonLibs-names-per-dir'
192ab741 FindPythonLibs: Allow find_library to search paths from system environment
3976a106 FindPythonLibs: Prefer libs early in search path regardless of name
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1378
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d508b1ee1841aaf899c4cb32fb913b42358776c
commit 0d508b1ee1841aaf899c4cb32fb913b42358776c
Merge: 016daf0 e7720a0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 12 13:19:38 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 12 09:19:53 2017 -0400
Merge topic 'FindXMLRPC-no-includes'
e7720a0f FindXMLRPC: Tolerate no include directories
b1aa8a47 FindXMLRPC: Drop unnecessary exec_program code paths
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1377
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=016daf0391f8f4bfda1d42b7c86516acca1f0b2b
commit 016daf0391f8f4bfda1d42b7c86516acca1f0b2b
Merge: add1ba9 b6d3a1c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 12 13:15:43 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 12 09:15:57 2017 -0400
Merge topic 'clang-msvc-help'
b6d3a1c0 Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1373
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=192ab741ec65c96945893367bd3d04c08ca0f47a
commit 192ab741ec65c96945893367bd3d04c08ca0f47a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 11 11:04:27 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 11 11:07:58 2017 -0400
FindPythonLibs: Allow find_library to search paths from system environment
Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library`
calls. No other find modules do this. Also, since commit
v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from
PATH, 2015-02-18) we always search the `lib` directory of each prefix
before the `bin` directory and so should prefer the non-`.dll` name.
Issue: #17336
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 986726a..341d5d9 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -153,15 +153,11 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
${PYTHON_FRAMEWORK_LIBRARIES}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
- # Avoid finding the .dll in the PATH. We want the .lib.
- NO_SYSTEM_ENVIRONMENT_PATH
)
# Look for the static library in the Python config directory
find_library(PYTHON_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
NAMES_PER_DIR
- # Avoid finding the .dll in the PATH. We want the .lib.
- NO_SYSTEM_ENVIRONMENT_PATH
# This is where the static library is usually located
PATH_SUFFIXES python${_CURRENT_VERSION}/config
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3976a1066afc89e23f4f7be2040c1e7835324f03
commit 3976a1066afc89e23f4f7be2040c1e7835324f03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 11 10:58:22 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 11 10:58:22 2017 -0400
FindPythonLibs: Prefer libs early in search path regardless of name
Add `NAMES_PER_DIR` to all `find_library` invocations so that we
consider all possible names in each search directory before moving on to
the next directory. This helps find the package that appears earliest
in the search path regardless of how it names its libraries.
Fixes: #17336
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 63ec9a8..986726a 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -122,6 +122,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
if(WIN32)
find_library(PYTHON_DEBUG_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
+ NAMES_PER_DIR
HINTS ${_Python_LIBRARY_PATH_HINT}
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
@@ -145,6 +146,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
python${_CURRENT_VERSION}m
python${_CURRENT_VERSION}u
python${_CURRENT_VERSION}
+ NAMES_PER_DIR
HINTS
${_Python_LIBRARY_PATH_HINT}
PATHS
@@ -157,6 +159,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
# Look for the static library in the Python config directory
find_library(PYTHON_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ NAMES_PER_DIR
# Avoid finding the .dll in the PATH. We want the .lib.
NO_SYSTEM_ENVIRONMENT_PATH
# This is where the static library is usually located
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCCompiler.cmake | 1 +
Modules/CMakeDetermineCXXCompiler.cmake | 1 +
Modules/CMakeDetermineCompilerId.cmake | 35 +++++++++++++++++++++++++
Modules/FindPythonLibs.cmake | 7 +++--
Modules/FindXMLRPC.cmake | 43 ++++++++++---------------------
5 files changed, 54 insertions(+), 33 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list