[certi-cvs] applications/PyHLA CMakeLists.txt doc/PyHLA.tex

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      11/03/16 12:11:50

Modified files:
        PyHLA          : CMakeLists.txt 
        PyHLA/doc      : PyHLA.tex 

Log message:
        fix bug #32788 : Cannot compile PyHLA 1.1.0 on Linux CentOS with 
Python2.4
        We now check for at least python 2.5

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/CMakeLists.txt?cvsroot=certi&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/doc/PyHLA.tex?cvsroot=certi&r1=1.10&r2=1.11

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CMakeLists.txt      11 Nov 2010 22:13:11 -0000      1.12
+++ CMakeLists.txt      16 Mar 2011 12:11:49 -0000      1.13
@@ -6,7 +6,7 @@
 SET(PACKAGE_NAME "PyHLA")
 SET(PACKAGE_VERSION_MAJOR "1")
 SET(PACKAGE_VERSION_MINOR "1")
-SET(PACKAGE_VERSION_PATCH "0")
+SET(PACKAGE_VERSION_PATCH "1cvs")
 SET(PACKAGE_VERSION 
"${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
   
 MESSAGE(STATUS "Configuring ${PACKAGE_NAME} version ${PACKAGE_VERSION}")
@@ -16,15 +16,18 @@
 
 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})
+    REGEX REPLACE "[A-Za-z\ ]*([0-9]+\\.[0-9]+\\.*[0-9]*)" "\\1"
+    PYTHON_VERSION "${PYTHON_VERSION_STRING}")
 MESSAGE(STATUS "Using Python: ${PYTHON_VERSION}")
+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(NOT PYTHON_PACKAGES_PATH)
     EXECUTE_PROCESS(
@@ -75,4 +78,4 @@
 
 INCLUDE(CPack)
 
-# $Id: CMakeLists.txt,v 1.12 2010/11/11 22:13:11 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.13 2011/03/16 12:11:49 erk Exp $

Index: doc/PyHLA.tex
===================================================================
RCS file: /sources/certi/applications/PyHLA/doc/PyHLA.tex,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- doc/PyHLA.tex       16 Jan 2010 17:55:15 -0000      1.10
+++ doc/PyHLA.tex       16 Mar 2011 12:11:50 -0000      1.11
@@ -107,7 +107,7 @@
 
 The \module{PyHLA} module requires
 \begin{itemize}
-\item Classic Python interpreter 2.4--2.6 
(\ulink{CPython}{http://www.python.org/download})
+\item Classic Python interpreter 2.5--2.6 
(\ulink{CPython}{http://www.python.org/download})
 \item HLA1.3 RTI with C++ API (\ulink{CERTI}{http://www.cert.fr/CERTI}, 
\ulink{M\"{A}K RTI}{http://www.mak.com/products/rti.php})
 \end{itemize}
 
@@ -209,4 +209,4 @@
 \input{PyHLA.ind}
 \end{document}
 
-% $Id: PyHLA.tex,v 1.10 2010/01/16 17:55:15 gotthardp Exp $
+% $Id: PyHLA.tex,v 1.11 2011/03/16 12:11:50 erk Exp $