cmake: sync with trunk

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34839 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/CMakeLists.txt

@@ -6,26 +6,74 @@
 # Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
 
 
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.6.4)
 
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 OLD)
 	cmake_policy(SET CMP0005 OLD)
 endif(COMMAND cmake_policy)
 
-# needed to distinguish fron trunk, so we can install both simultaneously
-project(lyx16)
+project(lyx)
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
-# is checked
+# where to look first for cmake modules,
+# before ${CMAKE_ROOT}/Modules is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
+include(LyXMacros)
+
+message(STATUS)
+message(STATUS "Switch LYX_* variables by -DLYX_*=1 or 0:")
+
+# Usage LYX_OPTION
+# 1. parameter: option name without prefix 'LYX_'
+# 2. parameter: description
+# 3. parameter: default value, ON or OFF
+# 4. parameter: system on which option is used: ALL, GCC, MSVC, ...
+LYX_OPTION(NLS "Use nls" OFF ALL)
+LYX_OPTION(ASPELL "Require aspell" OFF ALL)
+LYX_OPTION(DEBUG "Build debug version" OFF ALL)
+LYX_OPTION(RELEASE "Build release version" ON ALL)
+LYX_OPTION(PROFILE "Build profile version" OFF GCC)
+LYX_OPTION(USE_EXTERNAL_BOOST "Use external boost" OFF GCC)
+LYX_OPTION(USE_EXTERNAL_LIBINTL "Use external libintl" ON ALL)
+LYX_OPTION(INSTALL "Build install projects/rules" ON ALL)
+LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" OFF ALL)
+LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
+LYX_OPTION(NO_CONSOLE "Suppress console on Windows" OFF MSVC)
+LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
+LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
+LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
+LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
+LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
+LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)
+LYX_OPTION(CONCEPT_CHECKS "Enable concept-checks" OFF GCC)
+LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL)
+LYX_OPTION(SHARED_LIBRARIES "Build shared libraries" OFF ALL)
+
+message(STATUS)
+
 set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
 
-option(lyxinstall "Build install projects/rules" ON)
+
+if(UNIX OR MINGW)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+    message(STATUS "Using GCC version ${GCC_VERSION}")
+    if(NOT GCC_VERSION VERSION_LESS 4.4)
+        set(LYX_USE_TR1 1)
+        # GCC <= 4.5 does not support regex: there are linker errors
+        # http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.tr1
+        set(LYX_USE_TR1_REGEX 0)        
+    endif()
+else()
+    if(MSVC10)
+        set(LYX_USE_TR1 1)
+        set(LYX_USE_TR1_REGEX 1)
+    endif()
+endif()
+
 
 
 
@@ -75,16 +123,20 @@ foreach(_c_l ${_config_lines} )
   endif()
 endforeach(_c_l)
 
-if(UseVersionSuffix)
-  message(STATUS "-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
+
+if(LYX_PACKAGE_SUFFIX)
   set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
+else()  
+  set(PACKAGE ${PACKAGE_BASE})
+endif()
+
+if(LYX_PROGRAM_SUFFIX)
   set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
 else()
-  message(STATUS "-- PACKAGE not versioned, to enable use -DUseVersionSuffix=1")
-  set(PACKAGE ${PACKAGE_BASE})
   set(PROGRAM_SUFFIX "")
 endif()
 
+
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
   if (UNIX)
@@ -121,68 +173,51 @@ set(LYX_CPP_FILES *.cpp)
 set(LYX_HPP_FILES *.h)
 
 
-include(LyXMacros)
+
 include(ProjectSourceGroup)
 
-if(merge OR merge_rebuild)
-	set(merge 1 CACHE TYPE STRING FORCE)
-	set(MERGE_FILES 1 CACHE TYPE STRING FORCE)
-	message(STATUS "")
-	message(STATUS "All *.cpp files of a project are merged into two files, disable with -Dmerge=0")
-	message(STATUS "")
+if(LYX_MERGE_FILES)
 	add_definitions(-DLYX_MERGED_BUILD)
-else()
-	set(merge 0 CACHE TYPE STRING FORCE)
-	set(MERGE_FILES 0 CACHE TYPE STRING FORCE)
-	message(STATUS "Enable merging files with -Dmerge=1")
 endif()
 
 
 set(CMAKE_BUILD_TYPE Release)
 
-if(profile)
+if(LYX_PROFILE)
 	set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg"
-	    CACHE TYPE STRING FORCE)
-	set(profile)
+            CACHE TYPE STRING FORCE)
 endif()
 
-if(release)
+if(LYX_RELEASE)
 	set(CMAKE_BUILD_TYPE Release CACHE TYPE STRING FORCE)
-	set(release TRUE CACHE TYPE STRING FORCE)
-	set(release)
 endif()
 
-if(debug)
+if(LYX_DEBUG)
 	set(CMAKE_BUILD_TYPE Debug CACHE TYPE STRING FORCE)
-	set(debug TRUE CACHE TYPE STRING FORCE)
-	set(debug)
 endif()
 
-if(shared)
+
+
+if(LYX_SHARED_LIBRARIES)
 	set(library_type SHARED)
- 	message(STATUS "building shared libraries")
 else()
  	set(library_type STATIC)
 endif()
 
 if(NOT MSVC)
-	if(NOT quiet)
-		set(CMAKE_VERBOSE_MAKEFILE ON CACHE TYPE STRING FORCE)
-		message(STATUS "verbose Makefile, disable with -Dquiet=1")
-		message(STATUS "")
-	else()
-		set(CMAKE_VERBOSE_MAKEFILE OFF CACHE TYPE STRING FORCE)
+        if(NOT LYX_QUIET)
+                set(CMAKE_VERBOSE_MAKEFILE ON)
 	endif()
 	set(LYX_CXX_FLAGS -Wall)
-	if(stdlib-debug)
+        if(LYX_STDLIB_DEBUG)
 		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
 	endif()
-	if(concept-checks)
+        if(LYX_CONCEPT_CHECKS)
 		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
 	endif()
 	set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
-	set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -fno-strict-aliasing -O -g -D_DEBUG" CACHE TYPE STRING FORCE)
+	set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g -D_DEBUG" CACHE TYPE STRING FORCE)
 	if(MINGW)
 		set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
 	else()
@@ -197,17 +232,14 @@ add_definitions(-DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 
-if(all OR aspell)
-	set(aspell TRUE CACHE TYPE STRING)
+if(LYX_ASPELL)
 	find_package(ASPELL REQUIRED)
 else()
 	find_package(ASPELL)
 endif()
-set(aspell)
 
-set(use_external_libintl TRUE)
 
-if(use_external_libintl)
+if(LYX_USE_EXTERNAL_LIBINTL)
 	find_package(Libintl REQUIRED)
 	add_definitions(-DHAVE_GETTEXT)
 endif()
@@ -223,36 +255,24 @@ endif()
 if (ENCHANT_LIBRARY AND ENCHANT_INCLUDE_DIR)
   set(ENCHANT_FOUND TRUE)
   add_definitions(-DUSE_ENCHANT=1)
-  message(STATUS "----- Building with USE_ENCHANT")
+  message(STATUS "Building with USE_ENCHANT")
 else()
-  message(STATUS "----- Enchant not found, building without enchant support")
+  message(STATUS "Enchant not found, building without enchant support")
 endif()
 
-message(STATUS "")
-if(nls OR all)
-	set(nls TRUE CACHE TYPE STRING)
-	add_definitions(-DENABLE_NLS=1)
-	message(STATUS "----- Building with ENABLE_NLS")
-else()
-	message(STATUS "----- No nls, to enable use -Dnls=1")
+
+if(LYX_NLS)
+        add_definitions(-DENABLE_NLS=1)
 endif()
-set(nls)
+
 if(ASPELL_FOUND)
 	add_definitions(-DUSE_ASPELL=1)
-	message(STATUS "----- Building with USE_ASPELL")
-else()
-	message(STATUS "----- No aspell, to get more information use -Daspell=1")
 endif()
-set(all)
 
 if(WIN32)
-	if(noconsole)
-		set(noconsole TRUE CACHE TYPE STRING)
+        if(LYX_NO_CONSOLE)
 		set(WIN32_CONSOLE WIN32)
 		set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
-		message(STATUS "----- Console disabled")
-	else()
-		message(STATUS "----- Console enabled, disable it with -Dnoconsole=1")
 	endif()
 	if(MSVC)
 		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
@@ -280,17 +300,9 @@ message(STATUS "")
 # PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260
 # Not sure if it works for all non-msvc compilers
 include(PCHSupport_26)
-if (MSVC)
-	option(disable-pch "Disable precompiled headers" ON)
-else()
-	option(disable-pch "Disable precompiled headers" ON)
-endif()
 
-if(NOT disable-pch)
+if(NOT LYX_DISABLE_PCH)
 
-	message(STATUS "-----")
-	message(STATUS "----- using precompiled headers, disable with -Ddisable-pch=1")
-	message(STATUS "-----")
 	configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h)
 	configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake ${CMAKE_BINARY_DIR}/config_pch.cpp)
 	add_definitions(-DLYX_ENABLE_PCH)
@@ -313,17 +325,12 @@ if(NOT disable-pch)
 		macro(lyx_add_msvc_pch name_)
 		endmacro()
 		macro(lyx_add_gcc_pch name_)
-			add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4)
+                        add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4)
 			ADD_PRECOMPILED_HEADER(${name_} ${CMAKE_BINARY_DIR}/config_pch.cpp ${CMAKE_BINARY_DIR}/config.h.gch)
 		endmacro()
 	endif()
 else()
-	if(MSVC)
-		message(STATUS "-----")
-		message(STATUS "----- precompiled headers disabled, enable with -Ddisable-pch=0")
-		message(STATUS "-----")
-	endif()
-	set(disable-pch TRUE CACHE TYPE STRING)
+	set(LYX_DISABLE_PCH TRUE CACHE TYPE STRING)
 	macro(lyx_add_msvc_pch)
 	endmacro(lyx_add_msvc_pch)
 	macro(lyx_add_gcc_pch name_)
@@ -331,23 +338,14 @@ else()
 endif()
 
 if(MSVC)
-       if(vld)
-               set(vld 1 CACHE TYPE STRING FORCE)
+       if(LYX_VLD)
                set(LYX_LEAK_DETECTION 1 CACHE TYPE STRING FORCE)
-               message(STATUS "")
-               message(STATUS "Leak detection enabled, disable with -Dvld=0")
-               message(STATUS "")
                set(LIBRARY_OUTPUT_PATH  ${EXECUTABLE_OUTPUT_PATH})
                set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/../Win32/vld)
                include(${vld_path}/tools/cmake/vld.cmake)
-       else()
-               set(vld 0 CACHE TYPE STRING FORCE)
-               set(LYX_LEAK_DETECTION 0 CACHE TYPE STRING FORCE)
-               message(STATUS "")
-               message(STATUS "Enable leak detection with -Dvld=1")
-               message(STATUS "")
        endif()
 
+        # TODO options
 	if(WALL)
 		set(WALL 1 CACHE TYPE STRING FORCE)
 
@@ -412,24 +410,20 @@ if(MSVC)
 
 endif()
 
-
 FIND_PROGRAM(_PERL_EXECUTABLE perl)
 if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
-    if(nls OR all)
+    if(LYX_NLS)
       find_package(LyXGettext REQUIRED)
       include_directories(${TOP_SRC_DIR}/po)
       add_subdirectory(po)
     endif()
 endif()
 
-option(debug_glibc "Enable libstdc++ debug mode" OFF)
-option(debug_glibc_pedantic "Enable libstdc++pedantic debug mode" OFF)
-
-if(debug_glibc)
+if(LYX_DEBUG_GLIBC)
   set(_GLIBCXX_DEBUG 1)
 endif()
 
-if(debug_glibc_pedantic)
+if(LYX_DEBUG_GLIBC_PEDANTIC)
   set(_GLIBCXX_DEBUG_PEDANTIC 1)
 endif()
 
@@ -458,8 +452,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TOP_SRC_DIR}/src)
 
-option(UseExternalBoost "Use external boost" OFF)
-if(UseExternalBoost)
+
+if(LYX_USE_EXTERNAL_BOOST)
   message(STATUS "Searching for boost")
   find_package(Boost COMPONENTS signals regex)
   if(Boost_FOUND)
@@ -470,7 +464,6 @@ if(UseExternalBoost)
     message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
   endif()
 else()
-  message(STATUS "----- Using internal boost. To build with installed version use -DUseExternalBoost:BOOL=ON")
   set(Lyx_Boost_Libraries boost_signals boost_regex)
   add_definitions(-DBOOST_USER_CONFIG="<config.h>")
   include_directories(${TOP_SRC_DIR}/boost)
@@ -478,12 +471,12 @@ else()
 endif()
 
 
-if(NOT use_external_libintl)
+if(NOT LYX_USE_EXTERNAL_LIBINTL)
   add_subdirectory(intl)
 endif()
 add_subdirectory(src)
 
-if(lyxinstall)
+if(LYX_INSTALL)
 	add_subdirectory(man)
 	if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
 		add_subdirectory(doc)
@@ -492,7 +485,7 @@ endif()
 add_subdirectory(lyx2lyx)
 add_subdirectory(scripts)
 
-if(lyxinstall)
+if(LYX_INSTALL)
 	include(../Install)
 endif()
 
@@ -525,10 +518,10 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/development/cmake/LyX_license.tx
 # Find the revision number and use it as the release in rpm-package-build.
 # This way we may omit the otherwise needed "--force" parameter when
 # installing from that rpm package.
-FIND_PROGRAM(_svnversion svnversion)
-message(STATUS "svnversion = ${_svnversion}")
-if(NOT ${_svnversion} MATCHES "-NOTFOUND")
-  EXECUTE_PROCESS(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+FIND_PROGRAM(LYX_SVNVERSION svnversion)
+#message(STATUS "svnversion = ${LYX_SVNVERSION}")
+if(NOT ${LYX_SVNVERSION} MATCHES "-NOTFOUND")
+  EXECUTE_PROCESS(COMMAND ${LYX_SVNVERSION} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
   # We use this value also to set the package-patch-value
   if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
     set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
@@ -539,7 +532,7 @@ endif()
 # so we do not provide infofiles for
 # CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
 
-if(lyxinstall)
+if(LYX_INSTALL)
 	include(CPack)
 endif()
 
@@ -563,3 +556,4 @@ endif()
 # list      # rpm -qlp lyx-2.0.1-Linux.rpm              # dpkg-deb -c lyx-2.0.1-Linux.deb
 # install   # rpm -U lyx-2.0.1-Linux.rpm                # dpkg -i lyx-2.0.1-Linux.deb
 #
+message(STATUS)

development/cmake/boost/libs/CMakeLists.txt

@@ -1,11 +1,12 @@
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 #
-# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
+# Copyright (c) 2010, Peter Kümmel, <syntheticpp@gmx.net>
 #
 
 project(boost)
 
-add_subdirectory(regex) 
+
+add_subdirectory(regex)
 add_subdirectory(signals) 
 

development/cmake/boost/libs/signals/CMakeLists.txt

@@ -16,7 +16,7 @@ set(boost_signals_sources
 
 lyx_add_path(boost_signals_sources ${TOP_SRC_DIR}/boost/libs/signals/src)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_library(boost_signals STATIC ${boost_signals_sources})
 else()
 	lyx_const_touched_files(_allinone  boost_signals_sources)

development/cmake/modules/LyXMacros.cmake

@@ -226,3 +226,26 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list)
    endif()
 endmacro(lyx_qt_resources_file)
 
+macro(LYX_OPTION _name _description _default _sys)
+        set(_msg OFF)
+        if(${_sys} MATCHES "GCC")
+                set(_system CMAKE_COMPILER_IS_GNUCXX)
+        else()
+                set(_system ${_sys})
+        endif()
+        if(${_system} MATCHES "ALL")
+                option(LYX_${_name} ${_description} ${_default})
+                set(_msg ON)
+        else()
+                if(${${_system}})
+                        option(LYX_${_name} ${_description} ${_default})
+                        set(_msg ON)
+                endif()
+        endif()
+        if(_msg)
+                string(SUBSTRING "LYX_${_name}                            " 0 25 _var)
+                string(SUBSTRING "${LYX_${_name}}     " 0 4 _val)
+                message(STATUS "${_var}: ${_val}   (${_description})")
+        endif()
+endmacro()
+

development/cmake/src/CMakeLists.txt

@@ -50,14 +50,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
 lyx_add_msvc_pch(lyx)
 
 
-if (NOT MERGE_FILES)
+if (NOT LYX_MERGE_FILES)
 	set(lyx_sources ${lyx_sources})
 else()
 	lyx_const_touched_files(_allinone  lyx_sources)
 	set(lyx_sources ${_allinone_files})
 endif()
 
-if (LYX_LEAK_DETECTION)
+if (LYX_VLD)
 	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/vld.ini COPYONLY)
 	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt COPYONLY)
 	set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt)

development/cmake/src/client/CMakeLists.txt

@@ -17,7 +17,6 @@ include_directories(BEFORE "${TOP_SRC_DIR}/src/client"
 
 add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
 
-
 target_link_libraries(${_lyxclient}
 	support
 	${Lyx_Boost_Libraries}

development/cmake/src/frontends/CMakeLists.txt

@@ -14,7 +14,7 @@ file(GLOB frontends_sources ${TOP_SRC_DIR}/src/frontends/${LYX_CPP_FILES})
 file(GLOB frontends_headers ${TOP_SRC_DIR}/src/frontends/${LYX_HPP_FILES})
 
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_library(frontends ${library_type} ${frontends_sources} ${frontends_headers})
 else()
 	lyx_const_touched_files(_allinone  frontends_sources)

development/cmake/src/frontends/qt4/CMakeLists.txt

@@ -36,7 +36,7 @@ include_directories(
 	${QT_INCLUDES}
 	${CMAKE_CURRENT_BINARY_DIR})
 
-if(MERGE_FILES)
+if(LYX_MERGE_FILES)
 	lyx_const_touched_files(_allinone frontends_qt4_sources)
 	set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
 	set_source_files_properties(_allinone_const.C

development/cmake/src/graphics/CMakeLists.txt

@@ -14,7 +14,7 @@ lyx_add_msvc_pch(graphics)
 
 include_directories(${TOP_SRC_DIR}/src/graphics)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_library(graphics ${library_type} ${graphics_sources} ${graphics_headers})
 else()
 	lyx_const_touched_files(_allinone  graphics_sources)

development/cmake/src/insets/CMakeLists.txt

@@ -16,7 +16,7 @@ lyx_add_msvc_pch(insets)
 include_directories(${TOP_SRC_DIR}/src/insets ${QT_INCLUDES})
 
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_library(insets ${library_type} ${insets_sources} ${insets_headers})
 else()
 	lyx_const_touched_files(_allinone  insets_sources)

development/cmake/src/mathed/CMakeLists.txt

@@ -17,7 +17,7 @@ lyx_add_msvc_pch(mathed)
 
 include_directories(${TOP_SRC_DIR}/src/mathed)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_library(mathed ${library_type} ${mathed_sources} ${mathed_headers})
 else()
 	lyx_const_touched_files(_allinone  mathed_sources)

development/cmake/src/support/CMakeLists.txt

@@ -49,7 +49,7 @@ include_directories(${TOP_SRC_DIR}/src/support
 	${ZLIB_INCLUDE_DIR})
 
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	set(support_sources ${support_sources} ${support_minizip_sources} ${support_minizip_cpp_sources} ${support_linkback_sources})
 	set(support_headers ${support_headers} ${support_minizip_headers} ${support_linkback_headers})
 	add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})

development/cmake/src/tex2lyx/CMakeLists.txt

@@ -28,7 +28,7 @@ include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx
 
 add_definitions(-DTEX2LYX)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources}
 		${tex2lyx_headers} ${LINKED_headers})
 else()