Skip to content
Snippets Groups Projects
Commit 92a435fd authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/py-hla] Fix cmake for python 3.4

python3.4 -V now returns on stdout while before it returns on stdout. It
breaks pyHLA version detection. Use standard PYTHON_VERSION_STRING from
FindPythonInterp.cmake to do the test instead.
parent 9d56a1a0
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@
PKG_VERSION= 1.1.1
DISTNAME= PyHLA-${PKG_VERSION}-Source
PKGNAME= ${PKGTAG.python}-hla-${PKG_VERSION}
PKGREVISION= 1
CATEGORIES= architecture
MASTER_SITES= http://gnu.mirrors.pair.com/savannah/savannah//certi/contrib/PyHLA/
......
......@@ -3,3 +3,4 @@ RMD160 (PyHLA-1.1.1-Source.tar.gz) = d2fdd7bbd9b5a45c1aa50aeaac3374fa9c465057
Size (PyHLA-1.1.1-Source.tar.gz) = 115908 bytes
SHA1 (patch-aa) = 6de74707e22cb4225e3a47af92b6ea896831568a
SHA1 (patch-ab) = 82665ec55ad932570223690030f33aeffe07350c
SHA1 (patch-ac) = 7d8f95a3318012762b5961f8a86528d4a9f1c7f0
--- CMakeLists.txt.orig 2015-03-06 13:50:52.047439570 +0100
+++ CMakeLists.txt 2015-03-06 13:54:32.655445126 +0100
@@ -16,18 +16,11 @@
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonInterp REQUIRED)
-EXECUTE_PROCESS(
- COMMAND "${PYTHON_EXECUTABLE}" "-V"
- ERROR_VARIABLE PYTHON_VERSION_STRING
- ERROR_STRIP_TRAILING_WHITESPACE)
-STRING(
- REGEX REPLACE "[A-Za-z\ ]*([0-9]+\\.[0-9]+\\.*[0-9]*)" "\\1"
- PYTHON_VERSION "${PYTHON_VERSION_STRING}")
-MESSAGE(STATUS "Using Python: ${PYTHON_VERSION}")
+MESSAGE(STATUS "Using Python: ${PYTHON_VERSION_STRING}")
SET(PYTHON_NEEDED_VERSION "2.5")
-IF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
- message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION}")
-ENDIF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
+IF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
+ message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION_STRING}")
+ENDIF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}")
IF(NOT PYTHON_PACKAGES_PATH)
EXECUTE_PROCESS(
@@ -63,7 +56,7 @@
IF (WIN32)
SET(CPACK_SOURCE_GENERATOR "ZIP")
SET(CPACK_GENERATOR "NSIS;ZIP")
- SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION}")
+ SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION_STRING}")
ELSE (WIN32)
SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
SET(CPACK_GENERATOR "TGZ;ZIP;RPM")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment