The branch, master, has been updated. - Log -----------------------------------------------------------------
commit b1a409be979fe1a70caca4c8a01d2176a1dfcffe Author: Kornel Benko <[email protected]> Date: Fri Sep 21 15:09:46 2012 +0200 Make package name be platform dependent diff --git a/CMakeLists.txt b/CMakeLists.txt index ab80613..f04d6cf 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 2f85d79..43545e2 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}") ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 6 +----- development/cmake/LyxPackaging.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
