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 29f979f1f440bb3f88415c13685da58b46f0d591 (commit)
via ea2db3bb02b356ce46065789f60c1ed1a77eb995 (commit)
from fea3a1685297dc8940e8df446d697663fff08f4e (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=29f979f1f440bb3f88415c13685da58b46f0d591
commit 29f979f1f440bb3f88415c13685da58b46f0d591
Merge: fea3a16 ea2db3b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 16 11:41:08 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 16 11:41:08 2015 -0400
Merge topic 'FindPython-updates' into next
ea2db3bb FindPythonLibs: Fix OS X framework include directory search path
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea2db3bb02b356ce46065789f60c1ed1a77eb995
commit ea2db3bb02b356ce46065789f60c1ed1a77eb995
Author: David Gobbi <david.go...@gmail.com>
AuthorDate: Mon Sep 14 22:48:49 2015 -0600
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Sep 16 11:30:31 2015 -0400
FindPythonLibs: Fix OS X framework include directory search path
We use PATH_SUFFIXES to append "python<v>" to each candidate path. Do
not append it to the constructed list of python framework include
directories. Otherwise the combined path will never exist. Note that
the code doesn't yet try to match the suffixes "m" and "u" between the
executable, library, and include directory.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 127662d..1c8776b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -154,7 +154,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
foreach(dir ${Python_FRAMEWORKS})
list(APPEND PYTHON_FRAMEWORK_INCLUDES
-
${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
+ ${dir}/Versions/${_CURRENT_VERSION}/include)
endforeach()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonLibs.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
