]> git.lyx.org Git - lyx.git/blobdiff - src/CMakeLists.txt
Add support for the URW Classico (Optima) LaTeX font
[lyx.git] / src / CMakeLists.txt
index 86a7ed4c229ff4697bbe45542bc53038a8cf63ac..b5a9a29fa675c3e7e025d40ebb33f293b2743606 100644 (file)
@@ -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)
@@ -72,11 +72,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
 
 lyx_add_msvc_pch(lyx)
 
-if (LYX_DEVEL_VERSION)
-       add_definitions(-DDEVEL_VERSION)
-endif()
-
-
 if (LYX_MERGE_FILES)
        if(dont_merge)
                list(REMOVE_ITEM lyx_sources ${dont_merge})
@@ -105,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}
@@ -115,6 +113,7 @@ add_executable(${_lyx}
        ${FILE_RC}
        ${lyx_info_files}
        ${lyx_cmake_files}
+       ${OSX_BUNDLE_FILES}
 )
 
 
@@ -127,12 +126,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()
@@ -142,6 +140,9 @@ endif()
 if(ENCHANT_FOUND)
        target_link_libraries(${_lyx} ${ENCHANT_LIBRARY})
 endif()
+if(Magic_FOUND)
+       target_link_libraries(${_lyx} ${Magic_LIBRARY})
+endif()
 
 if(APPLE)
        target_link_libraries(${_lyx} "-bind_at_load")
@@ -167,7 +168,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)