Revert "Fix the display of column spacing in AMS environments"

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b1b5049b25f9008bd5544d3df435b3104f13150..eb350c1774ae418d0eee5c9b343fa1ef2f231478 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)
@@ -74,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)
 
@@ -93,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()
@@ -123,33 +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
        ${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")
@@ -164,6 +149,10 @@ if(MINGW)
        target_link_libraries(${_lyx} ole32)
 endif()
 
+if(CYGWIN)
+       target_link_libraries(${_lyx} gdi32 shlwapi ole32)
+endif()
+
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
 install(TARGETS ${_lyx}