anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21825 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-11-27 19:57:03 +00:00
parent 8b56472233
commit 3665dc404e
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/boost/libs/CMakeLists.txt
View File

@ -6,7 +6,7 @@
project(boost) project(boost)
add_subdirectory(filesystem) #add_subdirectory(filesystem)
#add_subdirectory(iostreams) #add_subdirectory(iostreams)
add_subdirectory(regex) add_subdirectory(regex)
add_subdirectory(signals) add_subdirectory(signals)

3
development/cmake/src/CMakeLists.txt
View File

@ -58,8 +58,7 @@ target_link_libraries(lyx
graphics graphics
support support
intl intl
${QT_QTMAIN_LIBRARY} ${QT_QTMAIN_LIBRARY})
boost_filesystem)
if(ASPELL_FOUND) if(ASPELL_FOUND)
target_link_libraries(lyx ${ASPELL_LIBRARY}) target_link_libraries(lyx ${ASPELL_LIBRARY})

3
development/cmake/src/frontends/qt4/CMakeLists.txt
View File

@ -50,8 +50,7 @@ endif()
target_link_libraries(frontend_qt4 target_link_libraries(frontend_qt4
frontends frontends
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY})
boost_filesystem)
if(WIN32) if(WIN32)
target_link_libraries(frontend_qt4 Gdi32) target_link_libraries(frontend_qt4 Gdi32)

11
development/cmake/src/support/CMakeLists.txt
View File

@ -25,6 +25,8 @@ list(REMOVE_ITEM support_sources
lyx_add_msvc_pch(support) lyx_add_msvc_pch(support)
lyx_automoc(${support_sources})
include_directories(${TOP_SRC_DIR}/src/support include_directories(${TOP_SRC_DIR}/src/support
${TOP_SRC_DIR}/src/support/minizip ${TOP_SRC_DIR}/src/support/minizip
${QT_INCLUDES} ${QT_INCLUDES}
@ -37,12 +39,17 @@ if(NOT MERGE_FILES)
add_library(support ${library_type} ${support_sources} ${support_headers}) add_library(support ${library_type} ${support_sources} ${support_headers})
else() else()
lyx_const_touched_files(_allinone support_sources) 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} add_library(support ${library_type} ${_allinone_files}
${support_minizip_sources} ${support_minizip_cpp_sources}) ${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers})
endif() endif()
target_link_libraries(support boost_signals) target_link_libraries(support boost_signals ${QT_QTCORE_LIBRARY} )
if(WIN32) if(WIN32)
target_link_libraries(support shlwapi) target_link_libraries(support shlwapi)

1
development/cmake/src/tex2lyx/CMakeLists.txt
View File

@ -56,7 +56,6 @@ endif()
target_link_libraries(tex2lyx target_link_libraries(tex2lyx
support support
boost_filesystem
boost_regex boost_regex
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
intl) intl)