The usual tex2lyx tests update after file format change

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fd8b26f764b94a56aa9b8e7a1966548be3137a2..933a8f38455e8ce82adf86fdd64d41b609210446 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,7 +461,14 @@ else()
   set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
 endif()
 
-if(LYX_PACKAGE_SUFFIX)
+# The define below allows lyx-executable to find its default configuration files
+# see routines
+#    Package::messages_file()
+#    get_default_user_support_dir()
+#    relative_system_support_dir()
+# in src/support/Package.cpp
+#
+if(LYX_PROGRAM_SUFFIX)
        set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
 else()
        set(PACKAGE ${PACKAGE_BASE})
@@ -644,8 +651,9 @@ elseif(LYX_USE_QT MATCHES "QT4")
        macro (qt_wrap_uifiles)
                qt4_wrap_ui(${ARGN})
        endmacro()
+        set(LYX_QTMAIN_LIBRARY ${QT_QTSVG_LIBRARY})
        if(WIN32)
-               set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
+               list(APPEND LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
        endif()
 else()
   message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})")