also merge qt files

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

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index dcde46f5f5e03f785e95e60ace8787e2b1198ff3..7a946e3a145ee1f646673a2ab1cebb8583729bb8 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -37,7 +37,7 @@ endmacro(lyx_add_path _out _prefix)
 
 #create the implementation files from the ui files and add them to the list of sources
 #usage: LYX_ADD_QT4_UI_FILES(foo_SRCS ${ui_files})
-macro (LYX_ADD_UI_FILES _sources )
+macro (LYX_ADD_UI_FILES _sources _ui)
    foreach (_current_FILE ${ARGN})
 
       get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
@@ -57,7 +57,7 @@ macro (LYX_ADD_UI_FILES _sources )
          -P ${CMAKE_MODULE_PATH}/LyXuic.cmake
          MAIN_DEPENDENCY ${_tmp_FILE}
       )
-      set(${_sources} ${${_sources}} ${_header})
+      set(${_ui} ${${_ui}} ${_header})
    endforeach (_current_FILE)
 endmacro (LYX_ADD_UI_FILES)
 
@@ -127,14 +127,15 @@ endmacro (LYX_AUTOMOC)
 
 
 macro(lyx_merge_files _filename _list)
+       message("----- Generating merged file ${_filename}\n")  
        set(_tmp)
        set(_content)
-       foreach(_current ${${_list}})
-               file(READ ${_current} _tmp)
-               set(_content ${_content} "\n\n\n\n//----------------------------------------\n/*\n file: ${_current} \n*/\n\n")
-               set(_content ${_content} ${_tmp})
-       endforeach(_current)     
-       file(WRITE ${_filename} "${_content}")
+       foreach(_current ${${_list}})
+               file(READ ${_current} _tmp)
+               set(_content ${_content} "\n\n\n\n//----------------------------------------\n/*\n file: ${_current} \n*/\n\n")
+               set(_content ${_content} ${_tmp})
+       endforeach(_current)
+       file(WRITE ${_filename} "${_content}")
 endmacro(lyx_merge_files _list _filename)
 
 

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index ec26f4e2774b1b8a8330f5c8abddf64674642740..df63796586fb1c8f4ac48bbc1d4e3ad5bf078e69 100644 (file)
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -15,7 +15,7 @@ lyx_add_msvc_pch(frontends_qt4)
 
 lyx_automoc(${frontends_qt4_sources})
 
-lyx_add_ui_files(frontends_qt4_sources ${frontend_qt4_UI})
+lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI})
 
 add_definitions(
                -DQT_CLEAN_NAMESPACE
@@ -26,11 +26,19 @@ add_definitions(
                )
 
 
-include_directories(   ${TOP_SRC_DIR}/src/frontends/qt4 
+include_directories(   
+                       ${TOP_SRC_DIR}/src/frontends/qt4 
                        ${TOP_SRC_DIR}/src/frontends/controllers
                        ${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(frontend_qt4 STATIC ${frontends_qt4_sources} ${frontends_qt4_headers})
+if(MERGE_FILES AND MSVC)
+       lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/frontends_qt4_allinone.C frontends_qt4_sources)
+       set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
+       SET_SOURCE_FILES_PROPERTIES(frontends_qt4_allinone.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
+       add_library(frontend_qt4 STATIC ${CMAKE_CURRENT_BINARY_DIR}/frontends_qt4_allinone.C ${frontends_qt4_headers} ${ui_files})
+else(MERGE_FILES AND MSVC)     
+       add_library(frontend_qt4 STATIC ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files})
+else(MERGE_FILES AND MSVC)
 
 target_link_libraries(frontend_qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} controllers)
 

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index c2e7d3f120cfda1fc992384fd239a02910591566..7a4b67b94b33d50a6afd0c998a66615edbfa2684 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -29,6 +29,12 @@ include_directories(${TOP_SRC_DIR}/src/support ${ICONV_INCLUDE_DIR})
 if(NOT MERGE_FILES)
        add_library(support STATIC ${support_sources} ${support_headers})
 else(NOT MERGE_FILES)
+       # move to front
+       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/convert.C)
+       list(APPEND support_sources ${TOP_SRC_DIR}/src/support/convert.C)
+       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/lstrings.C)
+       list(APPEND support_sources ${TOP_SRC_DIR}/src/support/lstrings.C)
+       list(REVERSE support_sources)
        lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/support_allinone.C support_sources)
        add_library(support STATIC ${CMAKE_CURRENT_BINARY_DIR}/support_allinone.C)
 endif(NOT MERGE_FILES)