Author: kuemmel
Date: Tue May 17 23:53:05 2011
New Revision: 38780
URL: http://www.lyx.org/trac/changeset/38780
Log:
cmake: fix .dmg creation
Modified:
lyx-devel/trunk/CMakeLists.txt
lyx-devel/trunk/src/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Tue May 17 03:58:52 2011 (r38779)
+++ lyx-devel/trunk/CMakeLists.txt Tue May 17 23:53:05 2011 (r38780)
@@ -216,13 +216,18 @@
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()
Modified: lyx-devel/trunk/src/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/CMakeLists.txt Tue May 17 03:58:52 2011 (r38779)
+++ lyx-devel/trunk/src/CMakeLists.txt Tue May 17 23:53:05 2011 (r38780)
@@ -116,7 +116,7 @@
)
if(LYX_BUNDLE)
- set(MACOSX_BUNDLE_STRATUP_COMMAND ${_lyx})
+ set(MACOSX_BUNDLE_STARTUP_COMMAND ${_lyx})
endif()
lyx_add_gcc_pch(${_lyx})
