commit e501f2c473560577ad2510438fa1b4bfb30dd443
Author: Eugene Chornyi <[email protected]>
Date: Thu Jun 18 14:31:25 2020 +0200
Assure that LyX and tex2lyx use src/lyxwinres.rc
---
src/CMakeLists.txt | 4 +++-
src/tex2lyx/CMakeLists.txt | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7cf9c7..3910d85 100644
--- 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 1927655..cb129af 100644
--- 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()
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
