diff options
| author |  Elvio Basello | 2008-04-17 21:33:29 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-17 21:33:29 +0000 |
| commit | a42db2f5455ea66775a2b09dc890329b84b5c1be (patch) | |
| tree | 4eb6b34d671e085bef42f748eb1e922d916a1f4e | |
| parent | another quick fix/workaround in KviTalPopupMenu (diff) | |
| download | KVIrc-a42db2f5455ea66775a2b09dc890329b84b5c1be.tar.gz KVIrc-a42db2f5455ea66775a2b09dc890329b84b5c1be.tar.bz2 KVIrc-a42db2f5455ea66775a2b09dc890329b84b5c1be.zip | |
fixed DBus compilation for win32
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1497 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e8616787..c33eeb7f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,13 +163,18 @@ ENDIF() FIND_PACKAGE(Qt4 REQUIRED) IF(QT4_FOUND) SET(QT_USE_QT3SUPPORT true) - IF(APPLE) - SET(QT_USE_QTSQL true) - SET(QT_USE_QTXML true) - SET(QT_USE_QTNETWORK true) - ELSE() - SET(QT_USE_QTDBUS true) + IF(NOT WIN32) + IF(APPLE) + SET(QT_USE_QTSQL true) + SET(QT_USE_QTXML true) + SET(QT_USE_QTNETWORK true) + ELSE() + # Assume linux + SET(QT_USE_QTDBUS true) + ENDIF() ENDIF() + + # Phonon support IF(QT_PHONON_FOUND) ADD_DEFINITIONS(-DCOMPILE_PHONON_SUPPORT) SET(CMAKE_STATUS_PHONON_SUPPORT "yes") @@ -178,6 +183,7 @@ IF(QT4_FOUND) ELSE() SET(CMAKE_STATUS_PHONON_SUPPORT "not available") ENDIF() + ADD_DEFINITIONS(-DCOMPILE_USE_QT4) INCLUDE(${QT_USE_FILE}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${QT_INCLUDES}) diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 5450b478d..b1f0dc92e 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -112,7 +112,7 @@ KviAboutDialog::KviAboutDialog() // Get info QString infoString = "KVIrc <b>" KVI_VERSION " '" KVI_RELEASE_NAME "'</b><br><br>"; - #ifndef COMPILE_ON_WINDOWS +#ifndef COMPILE_ON_WINDOWS infoString += __tr2qs_ctx("System Name","about"); infoString += ": " KVI_BUILD_SYSTEM "<br>"; infoString += __tr2qs_ctx("CPU Name","about"); |