From 4c2c54f7ea1e2940f7a88d41810b502a16a6b0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sat, 10 Jul 2010 19:10:04 +0000 Subject: [PATCH] cmake: add icon on Windows git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34840 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/lyx.rc | 1 + development/cmake/src/CMakeLists.txt | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 development/cmake/lyx.rc diff --git a/development/cmake/lyx.rc b/development/cmake/lyx.rc new file mode 100644 index 0000000000..b0a7c29433 --- /dev/null +++ b/development/cmake/lyx.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "..\\Win32\\packaging\\icons\\lyx.ico" \ No newline at end of file diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index dd188b44fb..8fbb254cc8 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -63,11 +63,18 @@ if (LYX_VLD) set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt) endif() +if(WIN32) + set(FILE_RC ${CMAKE_SOURCE_DIR}/lyx.rc) + message(STATUS "Using icon defined in resource file: ${FILE_RC}") +endif() + + add_executable(${_lyx} ${WIN32_CONSOLE} ${lyx_sources} ${lyx_headers} ${vld_files} + ${FILE_RC} ) lyx_add_gcc_pch(${_lyx})