Allow counter insets in pass thru

[features.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7cf9c7bc63683dfca246c7ee79203a37b773a01..3a4dffd4555feaf1884f531d51c3a5e0d36f643f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,8 +95,10 @@ if (LYX_VLD)
 endif()
 
 if(WIN32 AND NOT MINGW)
-       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
-       message(STATUS "Using icon defined in resource file: ${FILE_RC}")
+  set(FILE_RC ${TOP_SRC_DIR}/src/lyxwinres.rc)
+  file(COPY ${TOP_SRC_DIR}/development/Win32/packaging/icons/lyx.ico DESTINATION ${CMAKE_BINARY_DIR})
+  file(COPY ${TOP_SRC_DIR}/development/Win32/packaging/icons/lyx_doc.ico DESTINATION ${CMAKE_BINARY_DIR})
+  message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
 
 lyx_find_info_files(LyXInfoFiles ${TOP_SRC_DIR}/*)
@@ -139,7 +141,7 @@ target_link_libraries(${_lyx}
        ${LYX_QTMAIN_LIBRARY}
        ${vld_dll})
 
-qt_use_modules(${_lyx} Core Gui)
+qt_use_modules(${_lyx} Core Gui ${QtCore5CompatModule})
 
 if(QT_USES_X11)
   find_package(X11 REQUIRED)