X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fsrc%2Ffrontends%2Fcontrollers%2FCMakeLists.txt;h=de97a654c1e3965d3700f2dd6fe1b09289719678;hb=3a74b10d917d43389f2490dffaeb401d6e220972;hp=a5c572348b189e9fc53056698a848b39cf3d9b5f;hpb=2ceb5e27693b7ac92611410d2e488821e6dd9ba5;p=lyx.git

diff --git a/development/cmake/src/frontends/controllers/CMakeLists.txt b/development/cmake/src/frontends/controllers/CMakeLists.txt
index a5c572348b..de97a654c1 100644
--- a/development/cmake/src/frontends/controllers/CMakeLists.txt
+++ b/development/cmake/src/frontends/controllers/CMakeLists.txt
@@ -9,15 +9,21 @@ project(controllers)
 file(GLOB controllers_sources ${TOP_SRC_DIR}/src/frontends/controllers/*.C)
 file(GLOB controllers_headers ${TOP_SRC_DIR}/src/frontends/controllers/*.h)
 
-lyx_add_msvc_pch(controllers_sources)
+lyx_add_msvc_pch(controllers)
 
 include_directories(${TOP_SRC_DIR}/src/frontends/controllers)
 
-add_library(controllers STATIC ${controllers_sources} ${controllers_headers})
+if(NOT MERGE_FILES)
+	add_library(controllers STATIC ${controllers_sources} ${controllers_headers})
+else(NOT MERGE_FILES)
+	lyx_merge_files(allinone controllers_sources)
+	add_library(controllers STATIC 
+					${CMAKE_CURRENT_BINARY_DIR}/allinone.h
+					${CMAKE_CURRENT_BINARY_DIR}/allinone_const.C
+					${CMAKE_CURRENT_BINARY_DIR}/allinone_touched.C)
+endif(NOT MERGE_FILES)
 
 target_link_libraries(controllers boost_regex boost_filesystem)
 
-add_dependencies(controllers ${pchlibname})
-
 project_source_group("${GROUP_CODE}" controllers_sources controllers_headers)