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, next has been updated
via d89405d63c1ab165e84799d00635ecf3294fb400 (commit)
via d0843f5a8b58a3a1d08189e94c4ae9f445bad724 (commit)
from 80095c1c08502d5dfe589eb2447a6c9ad8785c77 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d89405d63c1ab165e84799d00635ecf3294fb400
commit d89405d63c1ab165e84799d00635ecf3294fb400
Merge: 80095c1 d0843f5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 17 11:31:26 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 17 11:31:26 2015 -0400
Merge topic 'FindPython-updates' into next
d0843f5a fixup! FindPythonLibs: Match include dir to library version
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0843f5a8b58a3a1d08189e94c4ae9f445bad724
commit d0843f5a8b58a3a1d08189e94c4ae9f445bad724
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 17 11:28:16 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Sep 17 11:28:16 2015 -0400
fixup! FindPythonLibs: Match include dir to library version
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index ec9ee89..91cf49b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -174,11 +174,11 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
if(PYTHON_LIBRARY)
# Use the library's install prefix as a hint
- set(_INCLUDE_PATH_HINT)
+ set(_Python_INCLUDE_PATH_HINT)
get_filename_component(_PREFIX ${PYTHON_LIBRARY} PATH)
get_filename_component(_PREFIX ${_PREFIX} PATH)
if(_PREFIX)
- set(_INCLUDE_PATH_HINT ${_PREFIX}/include)
+ set(_Python_INCLUDE_PATH_HINT ${_PREFIX}/include)
endif()
# Add framework directories to the search paths
@@ -193,7 +193,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
find_path(PYTHON_INCLUDE_DIR
NAMES Python.h
HINTS
- ${_INCLUDE_PATH_HINT}
+ ${_Python_INCLUDE_PATH_HINT}
PATHS
${PYTHON_FRAMEWORK_INCLUDES}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
@@ -222,6 +222,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
endif()
endforeach()
+unset(_Python_INCLUDE_PATH_HINT)
unset(_Python_LIBRARY_PATH_HINT)
mark_as_advanced(
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonLibs.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
