Output a parbreak after a command.

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 425cd9ecafe01b67f9a2c0a36c098b26faafa607..526f37a556daad3b757160629cb0db558e2ca845 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,15 +11,11 @@ include_directories(${TOP_SRC_DIR}/src)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
 
-# support is the only directory containing objective-c files...
-add_subdirectory(support)
-# ...so we can add all the c++ specific flags after
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LYX_CXX_SPECIFIC_FLAGS}")
-
 add_subdirectory(frontends)
 add_subdirectory(graphics)
 add_subdirectory(insets)
 add_subdirectory(mathed)
+add_subdirectory(support)
 add_subdirectory(tex2lyx)
 if (UNIX)
        add_subdirectory(client)
@@ -107,10 +103,6 @@ lyx_find_info_files(LyXCMakeFiles ${TOP_MODULE_PATH}/*)
 lyx_find_info_files(LyXCMakeFiles ${TOP_SCRIPT_PATH}/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
-if (APPLE AND LYX_BUNDLE)
-        include(../Install)
-endif()
-
 add_executable(${_lyx}
        ${WIN32_CONSOLE}
        ${LYX_BUILD_BUNDLE}
@@ -170,22 +162,26 @@ endif()
 
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
-
-install(TARGETS ${_lyx}
-       RUNTIME DESTINATION bin
-       BUNDLE DESTINATION .)
+install(TARGETS ${_lyx} 
+    BUNDLE DESTINATION . COMPONENT Runtime
+    RUNTIME DESTINATION bin COMPONENT Runtime)
 
 if(LYX_BUNDLE)
-       if(NOT APPLE)
-               set(installed_lyx ${CMAKE_INSTALL_PREFIX}/bin/${_lyx}${CMAKE_EXECUTABLE_SUFFIX})
-       else()
+       if(APPLE)
+               # Now that lyx executable is defined, we can the files that should be included
+               # directly in the bundle. Note that resources are not copied with this mechanism:
+               # only the files necessary to run the executable are processed here (LyX.sdef, LyX.icns, etc.)
+               list(LENGTH OSX_BUNDLE_FILES OSX_BUNDLE_LAST_INDEX)
+               math(EXPR OSX_BUNDLE_LAST_INDEX "${OSX_BUNDLE_LAST_INDEX} - 1")
+               foreach(_i RANGE ${OSX_BUNDLE_LAST_INDEX})
+                   list(GET OSX_BUNDLE_FILES ${_i} _file)
+                   list(GET OSX_BUNDLE_DIRS ${_i} _directory)
+                   # Sets the location of the file into the OS X bundle
+                       set_source_files_properties("${_file}" PROPERTIES MACOSX_PACKAGE_LOCATION "${_directory}")
+               endforeach()
+
                set_target_properties(${_lyx} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/../Info.plist")
-               set(installed_lyx ${CMAKE_INSTALL_PREFIX}/${_lyx}.app)
-               set(LYX_BUNDLE_PROPERTY_MODE "ON")
-               include("../Install")
        endif()
-       install(CODE "include(BundleUtilities)
-                       fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
 endif()
 
 add_subdirectory(tests)