Cmake build:

[features.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index efa8d01d501b6c6b7ee561889d4a55d8426ce037..dd93a0ae70d6423cd22d00dc7dbe8f85d1dc29cd 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
 #
 
-set(_lyx ${PACKAGE_BASE}${PROGRAM_SUFFIX})
+set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 project(${_lyx})
 
 include_directories(${TOP_SRC_DIR}/src)
@@ -100,6 +100,9 @@ lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.msvc)
 lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/modules/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
+if (APPLE AND LYX_BUNDLE)
+        include(../Install)
+endif()
 
 add_executable(${_lyx}
        ${WIN32_CONSOLE}
@@ -110,8 +113,10 @@ add_executable(${_lyx}
        ${FILE_RC}
        ${lyx_info_files}
        ${lyx_cmake_files}
+       ${OSX_BUNDLE_FILES}
 )
 
+add_dependencies(${_lyx} lyx_version)
 
 lyx_add_gcc_pch(${_lyx})
 
@@ -122,12 +127,11 @@ target_link_libraries(${_lyx}
        frontend_qt4
        graphics
        support
-       ${LIBINTL_LIBRARIES}
+       ${intl_link}
        ${ICONV_LIBRARY}
        ${QT_QTMAIN_LIBRARY}
        ${vld_dll})
 
-
 if(HUNSPELL_FOUND)
        target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
 endif()
@@ -165,7 +169,10 @@ if(LYX_BUNDLE)
        if(NOT APPLE)
                set(installed_lyx ${CMAKE_INSTALL_PREFIX}/bin/${_lyx}${CMAKE_EXECUTABLE_SUFFIX})
        else()
+               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)