FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acsa

Browse Source
This commit is contained in:
Martin Rotter 2013-11-27 19:47:44 +01:00
parent c05878f47f
commit a60795ef43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -172,7 +172,7 @@ else(${USE_QT_5})
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif(${USE_QT_5}) endif(${USE_QT_5})
# Configure executable "properties" for Windows. # Configure executable "properties" for Windows or OS2.
if(WIN32) if(WIN32)
message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for Windows.") message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for Windows.")
configure_file ( configure_file (
@ -187,7 +187,7 @@ elseif(OS2 AND EXISTS $ENV{PATH}/windres.exe)
) )
endif(WIN32) endif(WIN32)
# Compile application icon if compiling with MinGW on WIN32. # Compile application icon if compiling with MinGW on WIN32 or with OS2.
if(MINGW AND WIN32) if(MINGW AND WIN32)
set(WINDRES windres.exe) set(WINDRES windres.exe)
message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for Windows.") message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for Windows.")
@ -203,14 +203,14 @@ if(MINGW AND WIN32)
# MSVC takes care of this automatically - no need to use windres.exe # MSVC takes care of this automatically - no need to use windres.exe
# for MSVC compilers. # for MSVC compilers.
elseif(OS2 AND EXISTS $ENV{PATH}/windres.exe) elseif(OS2 AND EXISTS $ENV{PATH}/windres.exe)
set(WINDRES $ENV{PATH}/windres.exe) #set(WINDRES $ENV{PATH}/windres.exe)
message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for OS2.") message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for OS2.")
message(STATUS "[${APP_LOW_NAME}] Used tool is: ${WINDRES}") message(STATUS "[${APP_LOW_NAME}] Used tool is: ${WINDRES}")
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o
COMMAND ${WINDRES} -i ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${WINDRES} -i ${CMAKE_CURRENT_BINARY_DIR}
-r ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc -r ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc
-o ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o
) )
set(APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o) set(APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o)
elseif(WIN32 AND MSVC) elseif(WIN32 AND MSVC)