projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid race conditions in the build system
[quassel.git]
/
pics
/
CMakeLists.txt
diff --git
a/pics/CMakeLists.txt
b/pics/CMakeLists.txt
index
5eb47d6
..
75f44aa
100644
(file)
--- a/
pics/CMakeLists.txt
+++ b/
pics/CMakeLists.txt
@@
-11,16
+11,16
@@
if(WIN32)
set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/win32.o PARENT_SCOPE)
endif(WINDRES_EXECUTABLE)
else(MINGW)
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)
+ set(COMMON_DEPS ${COMMON_DEPS} ../
../
pics/win32.rc PARENT_SCOPE)
endif(MINGW)
endif(WIN32)
if(WANT_MONO OR WANT_QTCLIENT)
if(EMBED_DATA)
endif(MINGW)
endif(WIN32)
if(WANT_MONO OR WANT_QTCLIENT)
if(EMBED_DATA)
- set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
+ set(CLIENT_RCS ${CLIENT_RCS} ../
../
pics/pics.qrc PARENT_SCOPE)
else(EMBED_DATA)
# We don't find them yet externally, so disable installation
else(EMBED_DATA)
# 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} ../
../
pics/pics.qrc PARENT_SCOPE)
# install(FILES qt-logo.png
# quassel-large.png
# DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)
# install(FILES qt-logo.png
# quassel-large.png
# DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)