From 4e922727e63ed65a5665a7a2f3f5c6bb2df7c72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Tue, 17 May 2011 21:53:05 +0000 Subject: [PATCH] cmake: fix .dmg creation git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38780 a592a061-630c-0410-9148-cb99ea01b6c8 --- CMakeLists.txt | 13 +++++++++---- src/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 367726bb54..22123dfc9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -216,13 +216,18 @@ if(LYX_DMG) set(bundle_dir ${TOP_BINARY_DIR}/bin) set(LYX_CPACK 1) set(LYX_BUNDLE MACOSX_BUNDLE) - set(LYX_INSTALL_PREFIX LyX2.1 CACHE STRING "LyX bundle install prefix" FORCE) + set(LYX_INSTALL_PREFIX LyX${LYX_INSTALL_SUFFIX} CACHE STRING "LyX bundle install prefix" FORCE) set(LYX_DATA_SUBDIR LyX.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE) + set(LYX_PROGRAM_SUFFIX "" CACHE STRING "disable suffix for dmg test" FORCE) #TODO remove + set(LYX_INSTALL_SUFFIX "" CACHE STRING "disable suffix for dmg test" FORCE) #TODO remove message(STATUS) - message(STATUS "Bundle creation is enabled.") - message(STATUS "It is experimental, to increase turn around speed use:") + message(STATUS "Bundle creation is enabled (experimental):") + message(STATUS " make") + message(STATUS " make install/strip") + message(STATUS " make package") + message(STATUS "To increase turn around speed use:") message(STATUS " cmake -DLYX_MERGE_FILES=1 -DLYX_NO_OPTIMIZE=1 -DLYX_INSTALL=1 -DLYX_DMG=1 ../trunk") - message(STATUS "or use the shell script 'developent/cmake/dmg'") + message(STATUS "or use the shell script 'development/cmake/dmg'") message(STATUS) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5918ba5800..f538d0f636 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -116,7 +116,7 @@ add_executable(${_lyx} ) if(LYX_BUNDLE) - set(MACOSX_BUNDLE_STRATUP_COMMAND ${_lyx}) + set(MACOSX_BUNDLE_STARTUP_COMMAND ${_lyx}) endif() lyx_add_gcc_pch(${_lyx})