X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=pics%2FCMakeLists.txt;h=d92e3a96be5311d5a794da035cb992895f660b8e;hp=8a604fd2b73c68b9696345e5af28e6e6242186fb;hb=a7acde8447823f9cd5f25aae569a1ec3a0174073;hpb=1ae121085988d0e82310f0666cf2e76afa73d772 diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index 8a604fd2..d92e3a96 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -1,28 +1,28 @@ # pics/ contains non-themed icons and other graphical resources if(WIN32) - if(MINGW) - find_program(WINDRES_EXECUTABLE NAMES windres) - if(WINDRES_EXECUTABLE) - exec_program(windres - ARGS "-i ${CMAKE_CURRENT_SOURCE_DIR}/win32.rc - -o ${CMAKE_CURRENT_BINARY_DIR}/win32.o - --include-dir=${CMAKE_CURRENT_SOURCE_DIR}") - set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/win32.o PARENT_SCOPE) - endif(WINDRES_EXECUTABLE) - else(MINGW) - set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.rc PARENT_SCOPE) - endif(MINGW) -endif(WIN32) + if(MINGW) + find_program(WINDRES_EXECUTABLE NAMES windres) + if(WINDRES_EXECUTABLE) + exec_program(windres + ARGS "-i ${CMAKE_CURRENT_SOURCE_DIR}/win32.rc" + "-o ${CMAKE_CURRENT_BINARY_DIR}/win32.o" + "--include-dir=${CMAKE_CURRENT_SOURCE_DIR}") + set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/win32.o PARENT_SCOPE) + endif() + else() + set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/win32.rc PARENT_SCOPE) + endif() +endif() if(WANT_MONO OR WANT_QTCLIENT) if(EMBED_DATA) - set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE) - else(EMBED_DATA) + set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE) + else() # We don't find them yet externally, so disable installation - set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE) + set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE) # install(FILES qt-logo.png # quassel-large.png # DESTINATION ${DATA_INSTALL_DIR}/quassel/pics) - endif(EMBED_DATA) -endif(WANT_MONO OR WANT_QTCLIENT) + endif() +endif()