[arch-commits] Commit in cmake/repos (20 files)
Felix Yan
fyan at archlinux.org
Sun Sep 20 03:11:01 UTC 2015
Date: Sunday, September 20, 2015 @ 05:11:01
Author: fyan
Revision: 246721
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cmake/repos/extra-i686/PKGBUILD
(from rev 246720, cmake/trunk/PKGBUILD)
cmake/repos/extra-i686/cmake.install
(from rev 246720, cmake/trunk/cmake.install)
cmake/repos/extra-i686/kdelibs-4.14.11.patch
(from rev 246720, cmake/trunk/kdelibs-4.14.11.patch)
cmake/repos/extra-i686/python-3.5.patch
(from rev 246720, cmake/trunk/python-3.5.patch)
cmake/repos/extra-i686/rebuild.list
(from rev 246720, cmake/trunk/rebuild.list)
cmake/repos/extra-x86_64/PKGBUILD
(from rev 246720, cmake/trunk/PKGBUILD)
cmake/repos/extra-x86_64/cmake.install
(from rev 246720, cmake/trunk/cmake.install)
cmake/repos/extra-x86_64/kdelibs-4.14.11.patch
(from rev 246720, cmake/trunk/kdelibs-4.14.11.patch)
cmake/repos/extra-x86_64/python-3.5.patch
(from rev 246720, cmake/trunk/python-3.5.patch)
cmake/repos/extra-x86_64/rebuild.list
(from rev 246720, cmake/trunk/rebuild.list)
Deleted:
cmake/repos/extra-i686/PKGBUILD
cmake/repos/extra-i686/cmake.install
cmake/repos/extra-i686/kdelibs-4.14.11.patch
cmake/repos/extra-i686/python-3.5.patch
cmake/repos/extra-i686/rebuild.list
cmake/repos/extra-x86_64/PKGBUILD
cmake/repos/extra-x86_64/cmake.install
cmake/repos/extra-x86_64/kdelibs-4.14.11.patch
cmake/repos/extra-x86_64/python-3.5.patch
cmake/repos/extra-x86_64/rebuild.list
------------------------------------+
/PKGBUILD | 134 ++++++++++++
/cmake.install | 24 ++
/kdelibs-4.14.11.patch | 80 +++++++
/python-3.5.patch | 378 +++++++++++++++++++++++++++++++++++
/rebuild.list | 10
extra-i686/PKGBUILD | 67 ------
extra-i686/cmake.install | 12 -
extra-i686/kdelibs-4.14.11.patch | 40 ---
extra-i686/python-3.5.patch | 36 ---
extra-i686/rebuild.list | 5
extra-x86_64/PKGBUILD | 67 ------
extra-x86_64/cmake.install | 12 -
extra-x86_64/kdelibs-4.14.11.patch | 40 ---
extra-x86_64/python-3.5.patch | 36 ---
extra-x86_64/rebuild.list | 5
15 files changed, 626 insertions(+), 320 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-i686/PKGBUILD 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.3.2
-pkgrel=2
-pkgdesc='A cross-platform open-source make system'
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
-makedepends=('qt5-base' 'python-sphinx' 'emacs')
-optdepends=('qt5-base: cmake-gui'
- 'libxkbcommon-x11: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" 'kdelibs-4.14.11.patch' 'python-3.5.patch')
-md5sums=('5febbd11bcaac854a27eebaf4a124be2'
- '1eeec67ab4bff6d92430d52acdbde142'
- 'cc5305ef44b935ef85e5ed2773a01aee')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
- patch -p1 -i ../kdelibs-4.14.11.patch
-
-# fix detection of Python 3.5
- patch -p1 --no-backup-if-mismatch -i ../python-3.5.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --sphinx-man \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- vimpath="${pkgdir}/usr/share/vim/vimfiles"
- install -d "${vimpath}"/{help,indent,syntax}
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
- "${vimpath}"/help/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
- "${vimpath}"/indent/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
- "${vimpath}"/syntax/
-
- install -d "${pkgdir}"/usr/share/emacs/site-lisp/
- emacs -batch -f batch-byte-compile \
- "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
- ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-i686/PKGBUILD (from rev 246720, cmake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.3.2
+pkgrel=3
+pkgdesc='A cross-platform open-source make system'
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+ 'libxkbcommon-x11: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" 'kdelibs-4.14.11.patch' 'python-3.5.patch')
+md5sums=('5febbd11bcaac854a27eebaf4a124be2'
+ '1eeec67ab4bff6d92430d52acdbde142'
+ 'c172343ccd88551f8858de1c8806ab79')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
+ patch -p1 -i ../kdelibs-4.14.11.patch
+
+# fix detection of Python 3.5
+ patch -p1 --no-backup-if-mismatch -i ../python-3.5.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --sphinx-man \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ vimpath="${pkgdir}/usr/share/vim/vimfiles"
+ install -d "${vimpath}"/{help,indent,syntax}
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
+ "${vimpath}"/help/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
+ "${vimpath}"/indent/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
+ "${vimpath}"/syntax/
+
+ install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+ emacs -batch -f batch-byte-compile \
+ "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-i686/cmake.install
===================================================================
--- extra-i686/cmake.install 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-i686/cmake.install 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-i686/cmake.install (from rev 246720, cmake/trunk/cmake.install)
===================================================================
--- extra-i686/cmake.install (rev 0)
+++ extra-i686/cmake.install 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/kdelibs-4.14.11.patch
===================================================================
--- extra-i686/kdelibs-4.14.11.patch 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-i686/kdelibs-4.14.11.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,40 +0,0 @@
-From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike at sf-mail.de>
-Date: Tue, 18 Aug 2015 12:14:43 +0200
-Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
-
-If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
-cmake_minimum_required() call is present this line can lead to an error as that
-string is empty so too few arguments are passed to if():
-
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
-CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
- given arguments:
-
- "VERSION_LESS" "3.1"
-
- Unknown arguments specified
-Call Stack (most recent call first):
- /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
- /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
----
- Modules/FindPkgConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 526a62e..ae6903e 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
-- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
-+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
---
-1.7.10.4
-
Copied: cmake/repos/extra-i686/kdelibs-4.14.11.patch (from rev 246720, cmake/trunk/kdelibs-4.14.11.patch)
===================================================================
--- extra-i686/kdelibs-4.14.11.patch (rev 0)
+++ extra-i686/kdelibs-4.14.11.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,40 @@
+From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike at sf-mail.de>
+Date: Tue, 18 Aug 2015 12:14:43 +0200
+Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
+
+If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
+cmake_minimum_required() call is present this line can lead to an error as that
+string is empty so too few arguments are passed to if():
+
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
+CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
+ given arguments:
+
+ "VERSION_LESS" "3.1"
+
+ Unknown arguments specified
+Call Stack (most recent call first):
+ /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
+ /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
+---
+ Modules/FindPkgConfig.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 526a62e..ae6903e 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
+ set(${_no_cmake_path} 1)
+ set(${_no_cmake_environment_path} 1)
+ endif()
+- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
++ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+ set(${_no_cmake_path} 1)
+ set(${_no_cmake_environment_path} 1)
+ endif()
+--
+1.7.10.4
+
Deleted: extra-i686/python-3.5.patch
===================================================================
--- extra-i686/python-3.5.patch 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-i686/python-3.5.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,36 +0,0 @@
-From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi at gmail.com>
-Date: Mon, 14 Sep 2015 21:44:36 -0600
-Subject: [PATCH] FindPython{Interp,Libs}: Add versions 3.5 and 3.6
-
----
- Modules/FindPythonInterp.cmake | 2 +-
- Modules/FindPythonLibs.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8784e18..879192e 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -51,7 +51,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index b80d3ce..d01fae4 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -64,7 +64,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
Copied: cmake/repos/extra-i686/python-3.5.patch (from rev 246720, cmake/trunk/python-3.5.patch)
===================================================================
--- extra-i686/python-3.5.patch (rev 0)
+++ extra-i686/python-3.5.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,189 @@
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index 8784e18..879192e 100644
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
+@@ -51,7 +51,7 @@ unset(_Python_NAMES)
+
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+
+ if(PythonInterp_FIND_VERSION)
+ if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+--- a/Modules/FindPythonLibs.cmake 2015-09-17 00:53:05.000000000 +0800
++++ b/Modules/FindPythonLibs.cmake 2015-09-20 10:49:56.252386270 +0800
+@@ -49,13 +49,41 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++# Use the executable's path as a hint
++set(_Python_LIBRARY_PATH_HINT)
++if(PYTHON_EXECUTABLE)
++ if(WIN32)
++ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
++ if(_Python_PREFIX)
++ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/libs)
++ endif()
++ unset(_Python_PREFIX)
++ else()
++ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
++ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
++ if(_Python_PREFIX)
++ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/lib)
++ endif()
++ unset(_Python_PREFIX)
++ endif()
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.cmake)
+ # Search for the python framework on Apple.
+ CMAKE_FIND_FRAMEWORKS(Python)
+
++# Save CMAKE_FIND_FRAMEWORK
++if(DEFINED CMAKE_FIND_FRAMEWORK)
++ set(_PythonLibs_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
++else()
++ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
++endif()
++# To avoid picking up the system Python.h pre-maturely.
++set(CMAKE_FIND_FRAMEWORK LAST)
++
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+
+ if(PythonLibs_FIND_VERSION)
+ if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
+@@ -103,6 +131,7 @@
+ if(WIN32)
+ find_library(PYTHON_DEBUG_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
++ HINTS ${_Python_LIBRARY_PATH_HINT}
+ PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+@@ -111,14 +140,24 @@
+ )
+ endif()
+
++ set(PYTHON_FRAMEWORK_LIBRARIES)
++ if(Python_FRAMEWORKS AND NOT PYTHON_LIBRARY)
++ foreach(dir ${Python_FRAMEWORKS})
++ list(APPEND PYTHON_FRAMEWORK_LIBRARIES
++ ${dir}/Versions/${_CURRENT_VERSION}/lib)
++ endforeach()
++ endif()
+ find_library(PYTHON_LIBRARY
+ NAMES
+- python${_CURRENT_VERSION_NO_DOTS}
+- python${_CURRENT_VERSION}mu
+- python${_CURRENT_VERSION}m
+- python${_CURRENT_VERSION}u
+- python${_CURRENT_VERSION}
++ python${_CURRENT_VERSION_NO_DOTS}
++ python${_CURRENT_VERSION}mu
++ python${_CURRENT_VERSION}m
++ python${_CURRENT_VERSION}u
++ python${_CURRENT_VERSION}
++ HINTS
++ ${_Python_LIBRARY_PATH_HINT}
+ PATHS
++ ${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.
+@@ -133,33 +172,42 @@
+ PATH_SUFFIXES python${_CURRENT_VERSION}/config
+ )
+
+- # For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if
+- # PYTHON_INCLUDE_DIR is not set.
+- if(DEFINED PYTHON_INCLUDE_PATH AND NOT DEFINED PYTHON_INCLUDE_DIR)
+- set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_PATH}" CACHE PATH
+- "Path to where Python.h is found" FORCE)
+- endif()
++ # Don't search for include dir until library location is known
++ if(PYTHON_LIBRARY)
+
+- set(PYTHON_FRAMEWORK_INCLUDES)
+- if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
+- foreach(dir ${Python_FRAMEWORKS})
+- set(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
+- ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
+- endforeach()
+- endif()
++ # Use the library's install prefix as a hint
++ set(_Python_INCLUDE_PATH_HINT)
++ get_filename_component(_Python_PREFIX ${PYTHON_LIBRARY} PATH)
++ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
++ if(_Python_PREFIX)
++ set(_Python_INCLUDE_PATH_HINT ${_Python_PREFIX}/include)
++ endif()
++ unset(_Python_PREFIX)
+
+- find_path(PYTHON_INCLUDE_DIR
+- NAMES Python.h
+- PATHS
+- ${PYTHON_FRAMEWORK_INCLUDES}
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- PATH_SUFFIXES
+- python${_CURRENT_VERSION}mu
+- python${_CURRENT_VERSION}m
+- python${_CURRENT_VERSION}u
+- python${_CURRENT_VERSION}
+- )
++ # Add framework directories to the search paths
++ set(PYTHON_FRAMEWORK_INCLUDES)
++ if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
++ foreach(dir ${Python_FRAMEWORKS})
++ list(APPEND PYTHON_FRAMEWORK_INCLUDES
++ ${dir}/Versions/${_CURRENT_VERSION}/include)
++ endforeach()
++ endif()
++
++ find_path(PYTHON_INCLUDE_DIR
++ NAMES Python.h
++ HINTS
++ ${_Python_INCLUDE_PATH_HINT}
++ PATHS
++ ${PYTHON_FRAMEWORK_INCLUDES}
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
++ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
++ PATH_SUFFIXES
++ python${_CURRENT_VERSION}mu
++ python${_CURRENT_VERSION}m
++ python${_CURRENT_VERSION}u
++ python${_CURRENT_VERSION}
++ )
++ endif()
+
+ # For backward compatibility, set PYTHON_INCLUDE_PATH.
+ set(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}")
+@@ -177,6 +225,9 @@
+ endif()
+ endforeach()
+
++unset(_Python_INCLUDE_PATH_HINT)
++unset(_Python_LIBRARY_PATH_HINT)
++
+ mark_as_advanced(
+ PYTHON_DEBUG_LIBRARY
+ PYTHON_LIBRARY
+@@ -201,6 +252,14 @@
+ # for historical reasons.
+ unset(PYTHON_FOUND)
+
++# Restore CMAKE_FIND_FRAMEWORK
++if(DEFINED _PythonLibs_CMAKE_FIND_FRAMEWORK)
++ set(CMAKE_FIND_FRAMEWORK ${_PythonLibs_CMAKE_FIND_FRAMEWORK})
++ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
++else()
++ unset(CMAKE_FIND_FRAMEWORK)
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
+ REQUIRED_VARS PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS
Deleted: extra-i686/rebuild.list
===================================================================
--- extra-i686/rebuild.list 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-i686/rebuild.list 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,5 +0,0 @@
-quazip
-glm
-gluon
-sfml
-wt
Copied: cmake/repos/extra-i686/rebuild.list (from rev 246720, cmake/trunk/rebuild.list)
===================================================================
--- extra-i686/rebuild.list (rev 0)
+++ extra-i686/rebuild.list 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,5 @@
+quazip
+glm
+gluon
+sfml
+wt
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-x86_64/PKGBUILD 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.3.2
-pkgrel=2
-pkgdesc='A cross-platform open-source make system'
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
-makedepends=('qt5-base' 'python-sphinx' 'emacs')
-optdepends=('qt5-base: cmake-gui'
- 'libxkbcommon-x11: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" 'kdelibs-4.14.11.patch' 'python-3.5.patch')
-md5sums=('5febbd11bcaac854a27eebaf4a124be2'
- '1eeec67ab4bff6d92430d52acdbde142'
- 'cc5305ef44b935ef85e5ed2773a01aee')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
- patch -p1 -i ../kdelibs-4.14.11.patch
-
-# fix detection of Python 3.5
- patch -p1 --no-backup-if-mismatch -i ../python-3.5.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --sphinx-man \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- vimpath="${pkgdir}/usr/share/vim/vimfiles"
- install -d "${vimpath}"/{help,indent,syntax}
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
- "${vimpath}"/help/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
- "${vimpath}"/indent/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
- "${vimpath}"/syntax/
-
- install -d "${pkgdir}"/usr/share/emacs/site-lisp/
- emacs -batch -f batch-byte-compile \
- "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
- ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 246720, cmake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.3.2
+pkgrel=3
+pkgdesc='A cross-platform open-source make system'
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+ 'libxkbcommon-x11: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" 'kdelibs-4.14.11.patch' 'python-3.5.patch')
+md5sums=('5febbd11bcaac854a27eebaf4a124be2'
+ '1eeec67ab4bff6d92430d52acdbde142'
+ 'c172343ccd88551f8858de1c8806ab79')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
+ patch -p1 -i ../kdelibs-4.14.11.patch
+
+# fix detection of Python 3.5
+ patch -p1 --no-backup-if-mismatch -i ../python-3.5.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --sphinx-man \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ vimpath="${pkgdir}/usr/share/vim/vimfiles"
+ install -d "${vimpath}"/{help,indent,syntax}
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
+ "${vimpath}"/help/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
+ "${vimpath}"/indent/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
+ "${vimpath}"/syntax/
+
+ install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+ emacs -batch -f batch-byte-compile \
+ "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-x86_64/cmake.install
===================================================================
--- extra-x86_64/cmake.install 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-x86_64/cmake.install 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-x86_64/cmake.install (from rev 246720, cmake/trunk/cmake.install)
===================================================================
--- extra-x86_64/cmake.install (rev 0)
+++ extra-x86_64/cmake.install 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/kdelibs-4.14.11.patch
===================================================================
--- extra-x86_64/kdelibs-4.14.11.patch 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-x86_64/kdelibs-4.14.11.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,40 +0,0 @@
-From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike at sf-mail.de>
-Date: Tue, 18 Aug 2015 12:14:43 +0200
-Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
-
-If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
-cmake_minimum_required() call is present this line can lead to an error as that
-string is empty so too few arguments are passed to if():
-
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
-See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
-CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
- given arguments:
-
- "VERSION_LESS" "3.1"
-
- Unknown arguments specified
-Call Stack (most recent call first):
- /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
- /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
----
- Modules/FindPkgConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 526a62e..ae6903e 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
-- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
-+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
---
-1.7.10.4
-
Copied: cmake/repos/extra-x86_64/kdelibs-4.14.11.patch (from rev 246720, cmake/trunk/kdelibs-4.14.11.patch)
===================================================================
--- extra-x86_64/kdelibs-4.14.11.patch (rev 0)
+++ extra-x86_64/kdelibs-4.14.11.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,40 @@
+From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike at sf-mail.de>
+Date: Tue, 18 Aug 2015 12:14:43 +0200
+Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
+
+If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
+cmake_minimum_required() call is present this line can lead to an error as that
+string is empty so too few arguments are passed to if():
+
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
+CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
+ given arguments:
+
+ "VERSION_LESS" "3.1"
+
+ Unknown arguments specified
+Call Stack (most recent call first):
+ /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
+ /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
+---
+ Modules/FindPkgConfig.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 526a62e..ae6903e 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
+ set(${_no_cmake_path} 1)
+ set(${_no_cmake_environment_path} 1)
+ endif()
+- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
++ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+ set(${_no_cmake_path} 1)
+ set(${_no_cmake_environment_path} 1)
+ endif()
+--
+1.7.10.4
+
Deleted: extra-x86_64/python-3.5.patch
===================================================================
--- extra-x86_64/python-3.5.patch 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-x86_64/python-3.5.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,36 +0,0 @@
-From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi at gmail.com>
-Date: Mon, 14 Sep 2015 21:44:36 -0600
-Subject: [PATCH] FindPython{Interp,Libs}: Add versions 3.5 and 3.6
-
----
- Modules/FindPythonInterp.cmake | 2 +-
- Modules/FindPythonLibs.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8784e18..879192e 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -51,7 +51,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index b80d3ce..d01fae4 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -64,7 +64,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
Copied: cmake/repos/extra-x86_64/python-3.5.patch (from rev 246720, cmake/trunk/python-3.5.patch)
===================================================================
--- extra-x86_64/python-3.5.patch (rev 0)
+++ extra-x86_64/python-3.5.patch 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,189 @@
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index 8784e18..879192e 100644
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
+@@ -51,7 +51,7 @@ unset(_Python_NAMES)
+
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+
+ if(PythonInterp_FIND_VERSION)
+ if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+--- a/Modules/FindPythonLibs.cmake 2015-09-17 00:53:05.000000000 +0800
++++ b/Modules/FindPythonLibs.cmake 2015-09-20 10:49:56.252386270 +0800
+@@ -49,13 +49,41 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++# Use the executable's path as a hint
++set(_Python_LIBRARY_PATH_HINT)
++if(PYTHON_EXECUTABLE)
++ if(WIN32)
++ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
++ if(_Python_PREFIX)
++ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/libs)
++ endif()
++ unset(_Python_PREFIX)
++ else()
++ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
++ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
++ if(_Python_PREFIX)
++ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/lib)
++ endif()
++ unset(_Python_PREFIX)
++ endif()
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.cmake)
+ # Search for the python framework on Apple.
+ CMAKE_FIND_FRAMEWORKS(Python)
+
++# Save CMAKE_FIND_FRAMEWORK
++if(DEFINED CMAKE_FIND_FRAMEWORK)
++ set(_PythonLibs_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
++else()
++ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
++endif()
++# To avoid picking up the system Python.h pre-maturely.
++set(CMAKE_FIND_FRAMEWORK LAST)
++
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+
+ if(PythonLibs_FIND_VERSION)
+ if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
+@@ -103,6 +131,7 @@
+ if(WIN32)
+ find_library(PYTHON_DEBUG_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
++ HINTS ${_Python_LIBRARY_PATH_HINT}
+ PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+@@ -111,14 +140,24 @@
+ )
+ endif()
+
++ set(PYTHON_FRAMEWORK_LIBRARIES)
++ if(Python_FRAMEWORKS AND NOT PYTHON_LIBRARY)
++ foreach(dir ${Python_FRAMEWORKS})
++ list(APPEND PYTHON_FRAMEWORK_LIBRARIES
++ ${dir}/Versions/${_CURRENT_VERSION}/lib)
++ endforeach()
++ endif()
+ find_library(PYTHON_LIBRARY
+ NAMES
+- python${_CURRENT_VERSION_NO_DOTS}
+- python${_CURRENT_VERSION}mu
+- python${_CURRENT_VERSION}m
+- python${_CURRENT_VERSION}u
+- python${_CURRENT_VERSION}
++ python${_CURRENT_VERSION_NO_DOTS}
++ python${_CURRENT_VERSION}mu
++ python${_CURRENT_VERSION}m
++ python${_CURRENT_VERSION}u
++ python${_CURRENT_VERSION}
++ HINTS
++ ${_Python_LIBRARY_PATH_HINT}
+ PATHS
++ ${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.
+@@ -133,33 +172,42 @@
+ PATH_SUFFIXES python${_CURRENT_VERSION}/config
+ )
+
+- # For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if
+- # PYTHON_INCLUDE_DIR is not set.
+- if(DEFINED PYTHON_INCLUDE_PATH AND NOT DEFINED PYTHON_INCLUDE_DIR)
+- set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_PATH}" CACHE PATH
+- "Path to where Python.h is found" FORCE)
+- endif()
++ # Don't search for include dir until library location is known
++ if(PYTHON_LIBRARY)
+
+- set(PYTHON_FRAMEWORK_INCLUDES)
+- if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
+- foreach(dir ${Python_FRAMEWORKS})
+- set(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
+- ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
+- endforeach()
+- endif()
++ # Use the library's install prefix as a hint
++ set(_Python_INCLUDE_PATH_HINT)
++ get_filename_component(_Python_PREFIX ${PYTHON_LIBRARY} PATH)
++ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
++ if(_Python_PREFIX)
++ set(_Python_INCLUDE_PATH_HINT ${_Python_PREFIX}/include)
++ endif()
++ unset(_Python_PREFIX)
+
+- find_path(PYTHON_INCLUDE_DIR
+- NAMES Python.h
+- PATHS
+- ${PYTHON_FRAMEWORK_INCLUDES}
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- PATH_SUFFIXES
+- python${_CURRENT_VERSION}mu
+- python${_CURRENT_VERSION}m
+- python${_CURRENT_VERSION}u
+- python${_CURRENT_VERSION}
+- )
++ # Add framework directories to the search paths
++ set(PYTHON_FRAMEWORK_INCLUDES)
++ if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
++ foreach(dir ${Python_FRAMEWORKS})
++ list(APPEND PYTHON_FRAMEWORK_INCLUDES
++ ${dir}/Versions/${_CURRENT_VERSION}/include)
++ endforeach()
++ endif()
++
++ find_path(PYTHON_INCLUDE_DIR
++ NAMES Python.h
++ HINTS
++ ${_Python_INCLUDE_PATH_HINT}
++ PATHS
++ ${PYTHON_FRAMEWORK_INCLUDES}
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
++ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
++ PATH_SUFFIXES
++ python${_CURRENT_VERSION}mu
++ python${_CURRENT_VERSION}m
++ python${_CURRENT_VERSION}u
++ python${_CURRENT_VERSION}
++ )
++ endif()
+
+ # For backward compatibility, set PYTHON_INCLUDE_PATH.
+ set(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}")
+@@ -177,6 +225,9 @@
+ endif()
+ endforeach()
+
++unset(_Python_INCLUDE_PATH_HINT)
++unset(_Python_LIBRARY_PATH_HINT)
++
+ mark_as_advanced(
+ PYTHON_DEBUG_LIBRARY
+ PYTHON_LIBRARY
+@@ -201,6 +252,14 @@
+ # for historical reasons.
+ unset(PYTHON_FOUND)
+
++# Restore CMAKE_FIND_FRAMEWORK
++if(DEFINED _PythonLibs_CMAKE_FIND_FRAMEWORK)
++ set(CMAKE_FIND_FRAMEWORK ${_PythonLibs_CMAKE_FIND_FRAMEWORK})
++ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
++else()
++ unset(CMAKE_FIND_FRAMEWORK)
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
+ REQUIRED_VARS PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS
Deleted: extra-x86_64/rebuild.list
===================================================================
--- extra-x86_64/rebuild.list 2015-09-20 03:10:21 UTC (rev 246720)
+++ extra-x86_64/rebuild.list 2015-09-20 03:11:01 UTC (rev 246721)
@@ -1,5 +0,0 @@
-quazip
-glm
-gluon
-sfml
-wt
Copied: cmake/repos/extra-x86_64/rebuild.list (from rev 246720, cmake/trunk/rebuild.list)
===================================================================
--- extra-x86_64/rebuild.list (rev 0)
+++ extra-x86_64/rebuild.list 2015-09-20 03:11:01 UTC (rev 246721)
@@ -0,0 +1,5 @@
+quazip
+glm
+gluon
+sfml
+wt
More information about the arch-commits
mailing list