diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2006-06-06 20:50:50 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2006-06-06 20:50:50 +0000 |
| commit | 45ab42fbd2e5aaf08d0fabba2090c65c502f7560 (patch) | |
| tree | b057921ae600c64e8aae0d9e6d487d1c63d88b23 | |
| parent | 700906bdeb7042b1584800877b5d6bc3ba702027 (diff) | |
| download | extra-cmake-modules-45ab42fbd2e5aaf08d0fabba2090c65c502f7560.tar.gz extra-cmake-modules-45ab42fbd2e5aaf08d0fabba2090c65c502f7560.tar.bz2 | |
win32 fixes
svn path=/trunk/KDE/kdelibs/; revision=548907
| -rw-r--r-- | modules/FindQtDBus.cmake | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/modules/FindQtDBus.cmake b/modules/FindQtDBus.cmake index 28de058d..079c71b8 100644 --- a/modules/FindQtDBus.cmake +++ b/modules/FindQtDBus.cmake @@ -27,19 +27,38 @@ if (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) else (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + if (WIN32) + find_file(QDBUS_DIR qt-dbus + ${_progFiles} + "C:/" + ) + set(QDBUS_DEFINITIONS CACHE INTERNAL "Definitions for Qt DBUS") + set(QDBUS_INCLUDE_DIRS ${QDBUS_DIR}/include/dbus-1.0 CACHE INTERNAL "Include dirs for Qt DBUS") - PKGCONFIG("dbus-1" _dbusIncDir _dbusLinkDir _dbusLinkFlags _dbusCflags) - PKGCONFIG("dbus-qt4-1" _qdbusIncDir _qdbusLinkDir _qdbusLinkFlags _qdbusCflags) + FIND_LIBRARY(QDBUS_LIBRARIES NAMES dbus-qt4-1 + PATHS ${QDBUS_DIR}/lib + ) + # how to add specific pathes to find_program, using PATHS seems not to work on win32 + # find_program(QDBUS_IDL2CPP_EXECUTABLE NAME dbusidl2cpp PATHS ${QDBUS_DIR}/bin) + find_file(QDBUS_IDL2CPP_EXECUTABLE dbusidl2cpp.exe ${QDBUS_DIR}/bin) + find_file(QDBUS_CPP2XML_EXECUTABLE dbuscpp2xml.exe ${QDBUS_DIR}/bin) + + else (WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG("dbus-1" _dbusIncDir _dbusLinkDir _dbusLinkFlags _dbusCflags) + PKGCONFIG("dbus-qt4-1" _qdbusIncDir _qdbusLinkDir _qdbusLinkFlags _qdbusCflags) + + set(QDBUS_DEFINITIONS ${_dbusCflags} ${_qdbusCflags} CACHE INTERNAL "Definitions for Qt DBUS") + set(QDBUS_INCLUDE_DIRS ${_dbusIncDir} ${_qdbusIncDir} CACHE INTERNAL "Include dirs for Qt DBUS") + + FIND_LIBRARY(QDBUS_LIBRARIES NAMES dbus-qt4-1 + PATHS ${_qdbusLinkDir} + ) - set(QDBUS_DEFINITIONS ${_dbusCflags} ${_qdbusCflags} CACHE INTERNAL "Definitions for Qt DBUS") - set(QDBUS_INCLUDE_DIRS ${_dbusIncDir} ${_qdbusIncDir} CACHE INTERNAL "Include dirs for Qt DBUS") - - FIND_LIBRARY(QDBUS_LIBRARIES NAMES dbus-qt4-1 - PATHS ${_qdbusLinkDir} - ) + endif (WIN32) if (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) set(QDBUS_FOUND TRUE) @@ -59,7 +78,8 @@ else (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) endif(QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) -find_program(QDBUS_IDL2CPP_EXECUTABLE NAME dbusidl2cpp PATHS) -find_program(QDBUS_CPP2XML_EXECUTABLE NAME dbuscpp2xml PATHS) - +if (NOT WIN32) + find_program(QDBUS_IDL2CPP_EXECUTABLE NAME dbusidl2cpp PATHS ) + find_program(QDBUS_CPP2XML_EXECUTABLE NAME dbuscpp2xml PATHS ) +endif (NOT WIN32) include( QtDBusMacros ) |