X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FLyxPackaging.cmake;h=4f9091bb3d57e3ba2878f1c10204646ad5048297;hb=aafd52f44167d5510be1ddcb974daa9dae486933;hp=849d8b8b4422f23e59cb85502ae3e5e1439312f6;hpb=4ed0b6cd5387b61d0e8f1a6b631d71e983205098;p=lyx.git

diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 849d8b8b44..4f9091bb3d 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -13,10 +13,21 @@ 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}")
-FILE(STRINGS "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+FILE(STRINGS "${TOP_CMAKE_PATH}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY)
 
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}")
@@ -24,7 +35,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}")
 #
 # needed by rpm
 set(CPACK_SET_DESTDIR "ON")
-FILE(READ "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE)
+FILE(READ "${TOP_CMAKE_PATH}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE)
 set(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing")
 set(CPACK_RPM_PACKAGE_VENDOR "The LyX team")
 #
@@ -32,23 +43,16 @@ set(CPACK_RPM_PACKAGE_VENDOR "The LyX team")
 set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
 
-# This is experimental, valid on _my_ system (Kornel)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>= 4.4.3-0)")
-if(ASPELL_FOUND)
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.6-1),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-endif()
-if(ENCHANT_FOUND)
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libenchant1c2a (>= 1.6.0-0),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-endif()
-if(LYX_EXTERNAL_BOOST)
-	if(Boost_FOUND)
-		set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0 (>= 1.40.0-4),libboost-signals1.40.0 (>= 1.40.0-4),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-	endif()
-endif()
+# We depend on python scripting
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.6)")
+
+# use dpkg-shlibdeps to generate additional info for package dependency list.
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
 #
 # for the next ones, cpack insists on data with values in some file
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_description.txt")
-set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_license.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_CMAKE_PATH}/LyX_description.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${TOP_CMAKE_PATH}/LyX_license.txt")
 
 # Use the revision number saved in ${LYX_PACKAGE_RELEASE}
 # as the release in rpm-package-build.
@@ -67,21 +71,27 @@ set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${TOP_SRC_DIR};/") # http://www.mail-arc
 
 set(CPACK_STRIP_FILES 1)
 
-# Finaly give some hints about files not to be included in souse package
+# Finaly give some hints about files not to be included in source package
 SET(CPACK_SOURCE_IGNORE_FILES
 "/CVS/"
 "/\\\\.svn/"
 "/\\\\.bzr/"
 "/\\\\.hg/"
 "/\\\\.git/"
+"/\\\\.project$"
+"/\\\\.cproject$"
+"/\\\\.history$"
+"\\\\.#"
 "\\\\.swp$"
 "~$"
-"\\\\.history$"
-"\\\\.#"
 "/#"
 "/_CPack_Packages/"
 "/CMakeCache.txt$"
-"CPackSourceConfig\\\\.cmake"
+"/CPackSourceConfig\\\\.cmake$"
+"/configCompiler\\\\.h$"
+"/install_manifest\\\\.txt$"
+"/cmake_install\\\\.cmake$"
+"/POTFILES"
 "\\\\.tar\\\\.gz$"
 "\\\\.tar\\\\.bz2$"
 "\\\\.tar\\\\.Z$"
@@ -89,8 +99,9 @@ SET(CPACK_SOURCE_IGNORE_FILES
 "\\\\.rpm$"
 "\\\\.rej$"
 "\\\\.orig$"
+"/core$"
 "/CMakeFiles/"
-"Makefile\\\\.in"
+"/Makefile\\\\.in$"
 "/Makefile$"
 "/autom4te\\\\.cache/"
 "/\\\\.deps/"