Assure that LyX and tex2lyx use src/lyxwinres.rc

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7cf9c7bc63683dfca246c7ee79203a37b773a01..3910d851f1d9e49d60369cd37219edea6e81604f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,7 +95,9 @@ if (LYX_VLD)
 endif()
 
 if(WIN32 AND NOT MINGW)
-       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
+  set(FILE_RC ${TOP_SRC_DIR}/src/lyxwinres.rc)
+  file(COPY ${TOP_SRC_DIR}/development/Win32/packaging/icons/lyx.ico DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  file(COPY ${TOP_SRC_DIR}/development/Win32/packaging/icons/lyx_doc.ico DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
 

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 1927655c7f7fffc1ee1d80cf3663f13d19461321..cb129af1585054d0c0774a899971916c5bdac5ed 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories((BEFORE
        ${ZLIB_INCLUDE_DIR})
 
 if(WIN32 AND NOT MINGW)
-       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
+       set(FILE_RC ${TOP_SRC_DIR}/src/lyxwinres.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()