update cmake build system

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

diff --git a/development/cmake/build-debug.bat b/development/cmake/build-debug.bat
index bf345ada4789fb99bd61f97b31879e9dc90cb569..e3bacdc5faeb6b87c65c313e15276fa6a12ba74f 100755 (executable)
--- a/development/cmake/build-debug.bat
+++ b/development/cmake/build-debug.bat
@@ -4,10 +4,11 @@
 cmake ..\trunk\development\cmake -Dmerge=1\r
 \r
 :: clean\r
-devenv lyx-qt4.sln /clean Debug\r
+devenv lyx.sln /clean Debug\r
 \r
 :: rebuild all generated files\r
 cmake ..\trunk\development\cmake -Dmerge_rebuild=1\r
 \r
 :: build release version\r
-devenv lyx-qt4.sln /build Debug
\ No newline at end of file
+devenv lyx.sln /build Debug\r
+\r

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index bb0a6511a4e59d50c06812bcfce42e587e81c754..a5597db2ffc810f30ad7008381d36d4919b91439 100755 (executable)
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -2,10 +2,11 @@
 cmake ..\trunk\development\cmake -Dmerge=1\r
 \r
 :: clean\r
-devenv lyx-qt4.sln /clean Release\r
+devenv lyx.sln /clean Release\r
 \r
 :: rebuild all generated files\r
 cmake ..\trunk\development\cmake -Dmerge_rebuild=1\r
 \r
 :: build release version\r
-devenv lyx-qt4.sln /build Release
\ No newline at end of file
+devenv lyx.sln /build Release\r
+\r

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index cef8055cae2995c071980a56ffeb4bae715f3392..b9dc1e76ab5e8b90ceec7dd331e6e0074a1b375c 100644 (file)
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -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