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 4ca5d3bc273000355b7ba620440c2d6aa6760d79 (commit) via 4a95ade6a357b73aead628c227c1fcccd127e394 (commit) via 18130ccbe6127ac828185a567e16d842966ba776 (commit) from 1d7ed1faaed7db47b20681adf44fdc22ea4f6903 (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=4ca5d3bc273000355b7ba620440c2d6aa6760d79 commit 4ca5d3bc273000355b7ba620440c2d6aa6760d79 Merge: 1d7ed1f 4a95ade Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Feb 23 12:44:23 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Feb 23 12:44:23 2012 -0500 Merge topic 'improve-findpythonlibs' into next 4a95ade Revert "AllFindModules test: require Python versions" 18130cc FindPythonLibs: unset PYTHON_FOUND that was accidentially set http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a95ade6a357b73aead628c227c1fcccd127e394 commit 4a95ade6a357b73aead628c227c1fcccd127e394 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Feb 23 18:43:27 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Thu Feb 23 18:43:27 2012 +0100 Revert "AllFindModules test: require Python versions" This reverts commit 7c95631da9dc9885e67d7ae23efc0d932318a1be. I now know what I wanted to. diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 185b07c..9257fcc 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -50,7 +50,7 @@ endif (NOT QT4_FOUND) set(VERSIONS_REQUIRED ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX FREETYPE GETTEXT GIF GIT ImageMagick JASPER LibArchive LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL - PYTHON PYTHONLIBS SWIG TIFF ZLIB) + SWIG TIFF ZLIB) foreach(VTEST ${VERSIONS_REQUIRED}) if (${VTEST}_FOUND) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18130ccbe6127ac828185a567e16d842966ba776 commit 18130ccbe6127ac828185a567e16d842966ba776 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Feb 23 18:42:40 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Thu Feb 23 18:42:40 2012 +0100 FindPythonLibs: unset PYTHON_FOUND that was accidentially set diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 469e89f..fcd0838 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -159,6 +159,10 @@ SET(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}") SET(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}") INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) SELECT_LIBRARY_CONFIGURATIONS(PYTHON) +# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library. +# Unset this, this prefix doesn't match the module prefix, they are different +# for historical reasons. +UNSET(PYTHON_FOUND) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs ----------------------------------------------------------------------- Summary of changes: Modules/FindPythonLibs.cmake | 4 ++++ Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits