Kornel's patch

[lyx.git] / development / cmake / src / CMakeLists.txt

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 63ad5ae2a05f62594e5d263dcf610d2626ea5fa9..8b99bc00c6c88421b9ac3b815319dfd5f5e08866 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -8,14 +8,15 @@ project(lyx)
 
 include_directories(${TOP_SRC_DIR}/src)
 
-add_subdirectory(frontends) 
-add_subdirectory(graphics) 
-add_subdirectory(insets) 
-add_subdirectory(mathed) 
-add_subdirectory(support) 
-add_subdirectory(tex2lyx) 
-
-
+add_subdirectory(frontends)
+add_subdirectory(graphics)
+add_subdirectory(insets)
+add_subdirectory(mathed)
+add_subdirectory(support)
+add_subdirectory(tex2lyx)
+if (UNIX)
+  add_subdirectory(client)
+endif()
 
 file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
@@ -26,29 +27,37 @@ list(REMOVE_ITEM lyx_sources
        ${TOP_SRC_DIR}/src/ISpell.cpp
        ${TOP_SRC_DIR}/src/Variables.cpp
        ${TOP_SRC_DIR}/src/Section.cpp)
-       
-if(ASPELL_FOUND)
+
+if (ASPELL_FOUND)
        include_directories(${ASPELL_INCLUDE_DIR})
        set(lyx_sources ${lyx_sources} ${TOP_SRC_DIR}/src/ASpell.cpp)
 endif()
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR}
+       ${ZLIB_INCLUDE_DIR})
 
 lyx_add_msvc_pch(lyx)
 
 
-if(NOT MERGE_FILES)
+if (NOT MERGE_FILES)
        set(lyx_sources ${lyx_sources})
 else()
        lyx_const_touched_files(_allinone  lyx_sources)
        set(lyx_sources ${_allinone_files})
 endif()
 
+if (LYX_LEAK_DETECTION)
+       configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/vld.ini COPYONLY)
+       configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt COPYONLY)
+       set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt)
+endif()
+
 add_executable(lyx
        ${WIN32_CONSOLE}
-       ${lyx_sources} 
+       ${lyx_sources}
        ${lyx_headers}
-       )
+       ${vld_files}
+)
 
 target_link_libraries(lyx
        mathed
@@ -57,18 +66,22 @@ target_link_libraries(lyx
        frontend_qt4
        graphics
        support
-       intl
+       ${LIBINTL_LIBRARIES}
+       ${ICONV_LIBRARY}
        ${QT_QTMAIN_LIBRARY}
-       boost_iostreams
-)
+       ${vld_dll})
 
-if(ASPELL_FOUND)
+if (ASPELL_FOUND)
        target_link_libraries(lyx ${ASPELL_LIBRARY})
 endif()
 
-if(APPLE)
-  target_link_libraries(lyx "-bind_at_load" ) 
-  target_link_libraries(lyx "-framework Carbon" ) 
+if (APPLE)
+  target_link_libraries(lyx "-bind_at_load")
+  target_link_libraries(lyx "-framework Carbon")
+endif()
+
+if (MINGW)
+  target_link_libraries(lyx ole32)
 endif()
 
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)