From: Kornel Benko <kornel@lyx.org>
Date: Fri, 21 Sep 2012 13:09:46 +0000 (+0200)
Subject: Make package name be platform dependent
X-Git-Tag: 2.1.0beta1~1528
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b1a409be979fe1a70caca4c8a01d2176a1dfcffe;p=lyx.git

Make package name be platform dependent
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab806136b3..f04d6cf873 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,7 @@
 cmake_minimum_required(VERSION 2.6.4)
 
 
-if(APPLE)
-	set(LYX_PROJECT LyX)
-else()
-	set(LYX_PROJECT lyx)
-endif()
+set(LYX_PROJECT LyX)
 
 set(LYX_CMAKE_DIR "development/cmake")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/${LYX_CMAKE_DIR}/modules")
diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 2f85d79aa1..43545e2bdd 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -13,6 +13,17 @@ if(LYX_BUNDLE)
 	endif()
 endif()
 
+# Overwrite package name dependent on platform
+# (Ignores the top project)
+if(APPLE)
+	# true on all systems whre __APPLE__ is defined in header files
+	set(CPACK_PACKAGE_NAME LyX)
+elseif(UNIX)
+	# True also for cygwin
+	set(CPACK_PACKAGE_NAME lyx)
+else()
+	set(CPACK_PACKAGE_NAME LyX)
+endif()
 
 set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")