[LyX/master] Cmake build: Assign package name dynamically

2014-04-19 Thread Kornel Benko
commit 1bff751639b10af6c5f78e50dc43422d4f8db40d
Author: Kornel Benko kor...@lyx.org
Date:   Sat Apr 19 11:09:25 2014 +0200

Cmake build: Assign package name dynamically

This enables to install different lyx-versions simultaneously via
the package manager.

diff --git a/development/cmake/LyxPackaging.cmake 
b/development/cmake/LyxPackaging.cmake
index 61d15b0..385e59e 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -17,12 +17,12 @@ endif()
 # (Ignores the top project)
 if(APPLE)
# true on all systems whre __APPLE__ is defined in header files
-   set(CPACK_PACKAGE_NAME LyX)
+   set(CPACK_PACKAGE_NAME LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION})
 elseif(UNIX)
# True also for cygwin
-   set(CPACK_PACKAGE_NAME lyx)
+   set(CPACK_PACKAGE_NAME lyx${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION})
 else()
-   set(CPACK_PACKAGE_NAME LyX)
+   set(CPACK_PACKAGE_NAME LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION})
 endif()
 
 set(CPACK_PACKAGE_VERSION_MAJOR ${LYX_MAJOR_VERSION})


[LyX/master] Cmake build: Assign package name dynamically

2014-04-19 Thread Kornel Benko
commit 1bff751639b10af6c5f78e50dc43422d4f8db40d
Author: Kornel Benko 
Date:   Sat Apr 19 11:09:25 2014 +0200

Cmake build: Assign package name dynamically

This enables to install different lyx-versions simultaneously via
the package manager.

diff --git a/development/cmake/LyxPackaging.cmake 
b/development/cmake/LyxPackaging.cmake
index 61d15b0..385e59e 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -17,12 +17,12 @@ endif()
 # (Ignores the top project)
 if(APPLE)
# true on all systems whre __APPLE__ is defined in header files
-   set(CPACK_PACKAGE_NAME LyX)
+   set(CPACK_PACKAGE_NAME "LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
 elseif(UNIX)
# True also for cygwin
-   set(CPACK_PACKAGE_NAME lyx)
+   set(CPACK_PACKAGE_NAME "lyx${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
 else()
-   set(CPACK_PACKAGE_NAME LyX)
+   set(CPACK_PACKAGE_NAME "LyX${LYX_MAJOR_VERSION}${LYX_MINOR_VERSION}")
 endif()
 
 set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")