Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac0ca1a70fb0cda54d3a79fc1491fb0284b96337..eb350c1774ae418d0eee5c9b343fa1ef2f231478 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,7 +70,7 @@ if(WIN32)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}
-       ${ZLIB_INCLUDE_DIR} ${QT_INCLUDES})
+       ${ZLIB_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${QT_INCLUDES})
 
 lyx_add_msvc_pch(lyx)
 
@@ -89,7 +89,7 @@ if (LYX_VLD)
        lyx_add_info_files(VLD ${vld_files})
 endif()
 
-if(WIN32)
+if(WIN32 AND NOT MINGW)
        set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
@@ -103,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}
@@ -123,34 +119,22 @@ add_dependencies(${_lyx} lyx_version)
 
 set_target_properties(${_lyx} PROPERTIES FOLDER "applications/LyX")
 
-qt_use_modules(${_lyx} Core Gui)
-
 lyx_add_gcc_pch(${_lyx})
 
 target_link_libraries(${_lyx}
        mathed
        insets
        frontends
-       frontend_qt4
+       frontend_qt
        graphics
        support
-       ${intl_link}
        ${ICONV_LIBRARY}
-       ${QT_QTMAIN_LIBRARY}
+       ${LYX_QTMAIN_LIBRARY}
        ${vld_dll})
 
-if(HUNSPELL_FOUND)
-       target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
-endif()
-if(ASPELL_FOUND)
-       target_link_libraries(${_lyx} ${ASPELL_LIBRARY})
-endif()
-if(ENCHANT_FOUND)
-       target_link_libraries(${_lyx} ${ENCHANT_LIBRARY})
-endif()
-if(Magic_FOUND)
-       target_link_libraries(${_lyx} ${Magic_LIBRARY})
-endif()
+qt_use_modules(${_lyx} Core Gui)
+
+lyx_target_link_libraries(${_lyx} HUNSPELL ASPELL ENCHANT Magic)
 
 if(APPLE)
        target_link_libraries(${_lyx} "-bind_at_load")
@@ -165,23 +149,32 @@ if(MINGW)
        target_link_libraries(${_lyx} ole32)
 endif()
 
-project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
+if(CYGWIN)
+       target_link_libraries(${_lyx} gdi32 shlwapi ole32)
+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)