projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make git revision in AboutDlg link to our gitweb
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
dd3355b
..
be6493c
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-169,7
+169,7
@@
if(STATIC AND WIN32)
endif(STATIC AND WIN32)
if(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
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}
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
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)
#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)