[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/PyHLA CMakeLists.txt
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/PyHLA CMakeLists.txt |
Date: |
Thu, 11 Nov 2010 22:13:12 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Petr Gotthard <gotthardp> 10/11/11 22:13:12
Modified files:
PyHLA : CMakeLists.txt
Log message:
Installer filename modified to include Python version.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/CMakeLists.txt?cvsroot=certi&r1=1.11&r2=1.12
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CMakeLists.txt 4 Oct 2010 20:56:19 -0000 1.11
+++ CMakeLists.txt 11 Nov 2010 22:13:11 -0000 1.12
@@ -17,6 +17,15 @@
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}")
+
IF(NOT PYTHON_PACKAGES_PATH)
EXECUTE_PROCESS(
COMMAND "${PYTHON_EXECUTABLE}"
"${CMAKE_CURRENT_SOURCE_DIR}/GetPackagesPath.py"
@@ -43,19 +52,20 @@
SET(CPACK_PACKAGE_NAME ${PACKAGE_NAME})
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+SET(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
+SET(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
+
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}")
ELSE (WIN32)
SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
SET(CPACK_GENERATOR "TGZ;ZIP;RPM")
ENDIF (WIN32)
-SET(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
-SET(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
-
SET(CPACK_SOURCE_IGNORE_FILES
"~" ".log" ".pdf" ".dvi" ".pyc" ".so" ".dll" ".zip" ".tar.gz" ".rpm"
".comFedRTI."
@@ -65,4 +75,4 @@
INCLUDE(CPack)
-# $Id: CMakeLists.txt,v 1.11 2010/10/04 20:56:19 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.12 2010/11/11 22:13:11 gotthardp Exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/PyHLA CMakeLists.txt,
certi-cvs <=