Re: Master branch partially opened for LyX 2.1.0

[Kornel Benko]

Am Mittwoch, 26. März 2014 um 16:41:24, schrieb Richard Heck <rgh...@lyx.org>
> On 03/26/2014 04:28 PM, Kornel Benko wrote:
> >
> > Am Mittwoch, 26. März 2014 um 21:08:42, schrieb Vincent van Ravesteijn 
> > <v...@lyx.org>
> >
...
> >
> > > Isn't there a dynamic way to do this. Parse configure.py or something ?
> >

Yes, there is.

> >
> > > Vincent
> >
> > You mean from configure.ac?
> >
> > But project() is called before configure.ac is parsed.
> >
> > Anyway, we are searching for the line '^AC_INIT(....)$',
> >
> > and ATM master and branch would give the same results.
> >
> 
> That sort of patch is fine with me, once all of you figure out what 
> exactly the best
> way to do it is.

I think the attached patch is ready for 2.1.1-staging + 2.2-staging

> Richard

        Kornel
diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 61d15b02..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}")

signature.asc
Description: This is a digitally signed message part.