anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Assure that LyX and tex2lyx use src/lyxwinres.rc

Browse Source
This commit is contained in:
Eugene Chornyi 2020-06-18 14:31:25 +02:00
parent c42776868d
commit e501f2c473
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -95,7 +95,9 @@ if (LYX_VLD)
endif() endif()
if(WIN32 AND NOT MINGW) 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}") message(STATUS "Using icon defined in resource file: ${FILE_RC}")
endif() endif()

2
src/tex2lyx/CMakeLists.txt
View File

@ -29,7 +29,7 @@ include_directories((BEFORE
${ZLIB_INCLUDE_DIR}) ${ZLIB_INCLUDE_DIR})
if(WIN32 AND NOT MINGW) 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}") message(STATUS "Using icon defined in resource file: ${FILE_RC}")
endif() endif()