From 3665dc404ea9f734b9b294e6e5ead0d9534bb220 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Tue, 27 Nov 2007 19:57:03 +0000
Subject: [PATCH] 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
---
 development/cmake/boost/libs/CMakeLists.txt        |  2 +-
 development/cmake/src/CMakeLists.txt               |  3 +--
 development/cmake/src/frontends/qt4/CMakeLists.txt |  3 +--
 development/cmake/src/support/CMakeLists.txt       | 11 +++++++++--
 development/cmake/src/tex2lyx/CMakeLists.txt       |  1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/development/cmake/boost/libs/CMakeLists.txt b/development/cmake/boost/libs/CMakeLists.txt
index b2a5655dfe..d55d66b5c5 100644
--- 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 0918f36768..5efceab267 100644
--- 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 1d6e658e72..2608acbafc 100644
--- 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 08cca220e0..fc269b3127 100644
--- 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 d1fa60fc23..414bd1b8a1 100644
--- 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)
-- 
2.39.2