cmake: fix .dmg creation

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a19a68ac2fe7f0c98170ce5b02041cfaaaa16081..22123dfc9c70352756324b1b54e63874fede9a83 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 cmake_minimum_required(VERSION 2.6.4)
 
+
 set(LYX_PROJECT lyx)
 
 set(LYX_CMAKE_DIR "development/cmake")
@@ -36,6 +37,10 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 # Supress regeneration
 set(CMAKE_SUPPRESS_REGENERATION FALSE)
 
+if(NOT help AND NOT HELP)
+       # 'project' triggers the searching for a compiler
+       project(${LYX_PROJECT})
+endif()
 
 include(LyXMacros)
 
@@ -84,8 +89,8 @@ LYX_OPTION(CONFIGURE_CHECKS      "Also run configure checks for MSVC" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
 
 # APPLE specific
-LYX_OPTION(DMG                   "Build as Mac bundle, needed for .dmg  (experimental) " OFF GCC)
-LYX_OPTION(COCOA                 "Use Cocoa on Mac" OFF GCC)
+LYX_OPTION(DMG                   "Build as Mac bundle, needed for .dmg  (experimental) " OFF MAC)
+LYX_OPTION(COCOA                 "Use Cocoa on Mac" OFF MAC)
 
 if(help OR HELP)
        message(STATUS)
@@ -95,9 +100,6 @@ if(help OR HELP)
        message(STATUS)
 else()
 
-# 'project' triggers the searching for a compiler
-project(${LYX_PROJECT})
-
 
 # Check option dependencies
 
@@ -214,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()
 
@@ -563,6 +570,7 @@ if(LYX_INSTALL)
        include(../Install)
 endif()
 
+add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")
 
 message(STATUS)
 message(STATUS "Build options, switch LYX_* variables by -DLYX_*=1 or 0:")