cmake build system:

[features.git] / development / cmake / src / CMakeLists.txt

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 90ef06eeaab4985d44184d4e2a4cd228e9ec586d..1edb6bcfb8d0c9c5cd720bce7a4e9dd1b6947ee0 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -37,7 +37,13 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 lyx_add_msvc_pch(lyx)
 
-set(lyx_sources ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.C)
+
+if(NOT MERGE_FILES)
+       set(lyx_sources ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.C)
+else(NOT MERGE_FILES)
+       lyx_merge_files(${CMAKE_CURRENT_BINARY_DIR}/lyx_allinone.C lyx_sources)
+       set(lyx_sources ${CMAKE_CURRENT_BINARY_DIR}/lyx_allinone.C ${CMAKE_CURRENT_BINARY_DIR}/version.C)
+endif(NOT MERGE_FILES)
 
 add_executable(lyx-${qt_postfix}
        ${WIN32_CONSOLE}