projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #525 - using 'away' as ultimate fallback if no away reason is specified
[quassel.git]
/
cmake
/
modules
/
QuasselMacros.cmake
diff --git
a/cmake/modules/QuasselMacros.cmake
b/cmake/modules/QuasselMacros.cmake
index
1f4d2fd
..
9d8c1cd
100644
(file)
--- a/
cmake/modules/QuasselMacros.cmake
+++ b/
cmake/modules/QuasselMacros.cmake
@@
-9,7
+9,10
@@
macro(setup_qt4_variables)
set(MAIN MAIN)
ENDIF(WIN32)
foreach(qtmod CORE ${ARGV} ${MAIN})
set(MAIN MAIN)
ENDIF(WIN32)
foreach(qtmod CORE ${ARGV} ${MAIN})
- set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY} ${QT_${qtmod}_LIB_DEPENDENCIES})
+ set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY})
+ if(STATIC)
+ set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_${qtmod}_LIB_DEPENDENCIES})
+ endif(STATIC)
endforeach(qtmod ${ARGV})
set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
endmacro(setup_qt4_variables)
endforeach(qtmod ${ARGV})
set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_LIBRARIES})
endmacro(setup_qt4_variables)
@@
-17,7
+20,7
@@
endmacro(setup_qt4_variables)
# This generates a .qm from a .ts file
macro(generate_qm outvar basename)
set(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
# This generates a .qm from a .ts file
macro(generate_qm outvar basename)
set(input ${CMAKE_SOURCE_DIR}/i18n/${basename}.ts)
- set(output ${CMAKE_
CURRENT_BINARY_DIR}
/${basename}.qm)
+ set(output ${CMAKE_
BINARY_DIR}/i18n
/${basename}.qm)
add_custom_command(OUTPUT ${output}
COMMAND ${QT_LRELEASE_EXECUTABLE}
ARGS ${input}
add_custom_command(OUTPUT ${output}
COMMAND ${QT_LRELEASE_EXECUTABLE}
ARGS ${input}