update cmake build system

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20047 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-09-04 18:41:37 +00:00
parent 9ecadac14d
commit 9924c11950
3 changed files with 6 additions and 13 deletions

View File

@ -4,10 +4,11 @@
cmake ..\trunk\development\cmake -Dmerge=1
:: clean
devenv lyx-qt4.sln /clean Debug
devenv lyx.sln /clean Debug
:: rebuild all generated files
cmake ..\trunk\development\cmake -Dmerge_rebuild=1
:: build release version
devenv lyx-qt4.sln /build Debug
devenv lyx.sln /build Debug

View File

@ -2,10 +2,11 @@
cmake ..\trunk\development\cmake -Dmerge=1
:: clean
devenv lyx-qt4.sln /clean Release
devenv lyx.sln /clean Release
:: rebuild all generated files
cmake ..\trunk\development\cmake -Dmerge_rebuild=1
:: build release version
devenv lyx-qt4.sln /build Release
devenv lyx.sln /build Release

View File

@ -28,15 +28,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR})
if(MERGE_FILES)
list(REMOVE_ITEM frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
list(APPEND frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
list(REVERSE frontends_qt4_sources)
list(REMOVE_ITEM frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
list(APPEND frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
lyx_const_touched_files(_allinone frontends_qt4_sources)
set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
set_source_files_properties(_allinone_const.C