cmake: more option cleanup, use LYX_OPTION macro for consistent messages and variable...

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

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index bf0838dd89f982c54ddd0a40e2513782c4fc24b5..a0fe949cfd2735da4a29a10408a92ad801200d67 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/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_mythes_sources} ${support_linkback_sources})
        set(support_headers ${support_headers} ${support_mythes_headers} ${support_linkback_headers})
        add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})