cmake: remove boost_filesystem, add automoc to support, link against QtCore

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21825 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/boost/libs/CMakeLists.txt b/development/cmake/boost/libs/CMakeLists.txt
index b2a5655dfef0f1596fe6cade9b25d8bd89852a31..d55d66b5c5b7fa29aefcd37410939db12606abe5 100644 (file)
--- a/development/cmake/boost/libs/CMakeLists.txt
+++ b/development/cmake/boost/libs/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 project(boost)
 
-add_subdirectory(filesystem) 
+#add_subdirectory(filesystem) 
 #add_subdirectory(iostreams) 
 add_subdirectory(regex) 
 add_subdirectory(signals) 

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 0918f36768d218cd9f6fae1c359b2a5add484a56..5efceab267dbaecd8971e5d45fb307205891007f 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -58,8 +58,7 @@ target_link_libraries(lyx
        graphics
        support
        intl
-       ${QT_QTMAIN_LIBRARY}
-       boost_filesystem)
+       ${QT_QTMAIN_LIBRARY})
 
 if(ASPELL_FOUND)
        target_link_libraries(lyx ${ASPELL_LIBRARY})

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 1d6e658e722bb5cf2809883126686d1bd93d76ee..2608acbafc5c0588b1dfe4f20638efec35e53c48 100644 (file)
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -50,8 +50,7 @@ endif()
 target_link_libraries(frontend_qt4 
        frontends
        ${QT_QTCORE_LIBRARY} 
-       ${QT_QTGUI_LIBRARY}
-       boost_filesystem)
+       ${QT_QTGUI_LIBRARY})
 
 if(WIN32)
        target_link_libraries(frontend_qt4 Gdi32)

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 08cca220e0bf3a7c90d7367fa64b120aa27196a5..fc269b3127bf42d53f8af1ee88601dd5f9f75aa0 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -24,6 +24,8 @@ list(REMOVE_ITEM support_sources
        ${TOP_SRC_DIR}/src/support/minizip/iowin32.c)
 
 lyx_add_msvc_pch(support)
+
+lyx_automoc(${support_sources})
        
 include_directories(${TOP_SRC_DIR}/src/support
        ${TOP_SRC_DIR}/src/support/minizip
@@ -37,12 +39,17 @@ if(NOT MERGE_FILES)
        add_library(support ${library_type} ${support_sources} ${support_headers})
 else()
        lyx_const_touched_files(_allinone  support_sources)
+               set(depends_moc ${support_headers})
+       set_source_files_properties(_allinone_const.C
+               PROPERTIES OBJECT_DEPENDS "${depends_moc}")
+       set_source_files_properties(_allinone_touched.C
+               PROPERTIES OBJECT_DEPENDS "${depends_moc}")     
        add_library(support ${library_type} ${_allinone_files}
-               ${support_minizip_sources} ${support_minizip_cpp_sources})
+               ${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers})
 endif()
 
 
-target_link_libraries(support boost_signals)
+target_link_libraries(support boost_signals  ${QT_QTCORE_LIBRARY} )
 
 if(WIN32)
        target_link_libraries(support shlwapi)

diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index d1fa60fc23f089253d5b7f336ea2d3d3f97db945..414bd1b8a10d3f24b42f682538e80b5f8f86ca06 100644 (file)
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -56,7 +56,6 @@ endif()
 
 target_link_libraries(tex2lyx  
        support
-       boost_filesystem
        boost_regex
        ${QT_QTCORE_LIBRARY} 
        intl)