projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
166da47
)
Trying to fix CMake for Mac. Does this work now?
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 12 Jun 2008 10:16:40 +0000
(12:16 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 12 Jun 2008 10:16:40 +0000
(12:16 +0200)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ee39a48
..
bfcfaf1
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-135,7
+135,7
@@
endif(WIN32)
macro(setup_qt4_variables)
set(QUASSEL_QT_DEFINITIONS ${QT_DEFINITIONS})
set(QUASSEL_QT_LIBRARIES )
macro(setup_qt4_variables)
set(QUASSEL_QT_DEFINITIONS ${QT_DEFINITIONS})
set(QUASSEL_QT_LIBRARIES )
- foreach(qtmod ${ARGV})
+ foreach(qtmod
CORE
${ARGV})
# This needs to be a string, not a list, otherwise set_target_properties screws up...
set(QUASSEL_QT_DEFINITIONS "${QUASSEL_QT_DEFINITIONS} -DQT_${qtmod}_LIB")
set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY} ${QT_${qtmod}_LIB_DEPENDENCIES})
# This needs to be a string, not a list, otherwise set_target_properties screws up...
set(QUASSEL_QT_DEFINITIONS "${QUASSEL_QT_DEFINITIONS} -DQT_${qtmod}_LIB")
set(QUASSEL_QT_LIBRARIES ${QUASSEL_QT_LIBRARIES} ${QT_QT${qtmod}_LIBRARY} ${QT_${qtmod}_LIB_DEPENDENCIES})
@@
-148,7
+148,7
@@
if(BUILD_CORE)
setup_qt4_variables(NETWORK SCRIPT SQL)
add_executable(quasselcore ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_SQL} ${RC_I18N} ${WIN32_RC})
setup_qt4_variables(NETWORK SCRIPT SQL)
add_executable(quasselcore ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_SQL} ${RC_I18N} ${WIN32_RC})
- set_target_properties(quasselcore PROPERTIES COMPILE_FLAGS "
${QUASSEL_QT_DEFINITIONS}
-DBUILD_CORE")
+ set_target_properties(quasselcore PROPERTIES COMPILE_FLAGS "
-DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB
-DBUILD_CORE")
target_link_libraries(quasselcore mod_core mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_CORE)
target_link_libraries(quasselcore mod_core mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_CORE)
@@
-156,7
+156,7
@@
if(BUILD_QTCLIENT)
setup_qt4_variables(GUI NETWORK)
add_executable(quasselclient ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
setup_qt4_variables(GUI NETWORK)
add_executable(quasselclient ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_I18N} ${WIN32_RC})
- set_target_properties(quasselclient PROPERTIES COMPILE_FLAGS "
${QUASSEL_QT_DEFINITIONS}
-DBUILD_QTUI")
+ set_target_properties(quasselclient PROPERTIES COMPILE_FLAGS "
-DQT_GUI_LIB -DQT_NETWORK_LIB
-DBUILD_QTUI")
target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_QTCLIENT)
target_link_libraries(quasselclient mod_qtui mod_uisupport mod_client mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_QTCLIENT)
@@
-164,6
+164,6
@@
if(BUILD_MONO)
setup_qt4_variables(GUI NETWORK SCRIPT SQL)
add_executable(quassel ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
setup_qt4_variables(GUI NETWORK SCRIPT SQL)
add_executable(quassel ${CMAKE_SOURCE_DIR}/src/common/main.cpp
${RC_ICONS} ${RC_QUASSEL_ICONS} ${RC_SQL} ${RC_I18N} ${WIN32_RC})
- set_target_properties(quassel PROPERTIES COMPILE_FLAGS "
${QUASSEL_QT_DEFINITIONS}
-DBUILD_MONO")
+ set_target_properties(quassel PROPERTIES COMPILE_FLAGS "
-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SCRIPT_LIB -DQT_SQL_LIB
-DBUILD_MONO")
target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_MONO)
target_link_libraries(quassel mod_qtui mod_uisupport mod_client mod_core mod_common ${QUASSEL_QT_LIBRARIES})
endif(BUILD_MONO)