diff --git a/CMakeLists.txt b/CMakeLists.txt index d26190d08..38e5648ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,7 @@ else(${USE_QT_5}) include(${QT_USE_FILE}) endif(${USE_QT_5}) -# Configure executable "properties" for Windows. +# Configure executable "properties" for Windows or OS2. if(WIN32) message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for Windows.") configure_file ( @@ -187,7 +187,7 @@ elseif(OS2 AND EXISTS $ENV{PATH}/windres.exe) ) 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) set(WINDRES windres.exe) 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 # for MSVC compilers. 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}] Used tool is: ${WINDRES}") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.o COMMAND ${WINDRES} -i ${CMAKE_CURRENT_BINARY_DIR} -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) elseif(WIN32 AND MSVC)