X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=be6493cb305e5cab91f6d9534581e9f12e2694b7;hp=dd3355b776b37c098afcc01b8aa46b25453df1e4;hb=f12ff6555fc60d165d5057902a91cdff355816b9;hpb=e65e46d007d7f5f59274590dec3bc1d8e5f94e91 diff --git a/CMakeLists.txt b/CMakeLists.txt index dd3355b7..be6493cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ if(STATIC AND WIN32) endif(STATIC AND WIN32) if(WIN32) - set(RC_WIN32 pics/win32.rc) # for app icons on windows + set(RC_WIN32 ../pics/win32.rc) # for app icons on windows endif(WIN32) # This is dirty, but I haven't found a cleaner way to ensure that the generated .qrc files @@ -184,7 +184,7 @@ target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES}) get_target_property(GENVERSION_EXECUTABLE genversion LOCATION) add_custom_target(genversion_run ALL ${GENVERSION_EXECUTABLE} - ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen) + ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/version.gen) add_dependencies(genversion_run genversion) # Decide what to do with icons @@ -217,7 +217,3 @@ add_subdirectory(icons) #add_subdirectory(pics) add_subdirectory(i18n) add_subdirectory(src) - -# Make sure version.gen exists before building mod_common -# TODO: make only main.cpp depend on that! Recompiles suck... -add_dependencies(mod_common genversion_run)