diff options
author | Andreas Holzammer <andy@kdab.com> | 2010-07-12 13:39:10 +0000 |
---|---|---|
committer | Andreas Holzammer <andy@kdab.com> | 2010-07-12 13:39:10 +0000 |
commit | bc451d8de618decb1ddd20ca1539ca0b8a08fc87 (patch) | |
tree | 91f62ef7a3ae6ee1cf972ed36124403cdfff5df2 /modules | |
parent | 786680cdb287a4f23429b45780037c86c55aafc1 (diff) | |
download | extra-cmake-modules-bc451d8de618decb1ddd20ca1539ca0b8a08fc87.tar.gz extra-cmake-modules-bc451d8de618decb1ddd20ca1539ca0b8a08fc87.tar.bz2 |
- made kdelibs compile for wince
- disabled some functionality for wince
- changed some stuff to unicode functions
svn path=/trunk/KDE/kdelibs/; revision=1149056
Diffstat (limited to 'modules')
-rw-r--r-- | modules/FindKDE4Internal.cmake | 8 | ||||
-rw-r--r-- | modules/FindKDEWin.cmake | 12 | ||||
-rw-r--r-- | modules/FindQt4.cmake | 14 | ||||
-rw-r--r-- | modules/FindSoprano.cmake | 8 | ||||
-rw-r--r-- | modules/FindWcecompat.cmake | 66 |
5 files changed, 105 insertions, 3 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 25a3e914..48395275 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -487,7 +487,13 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + if (NOT WINCE) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) + else (NOT WINCE) + set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 ) + endif(NOT WINCE) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen ) diff --git a/modules/FindKDEWin.cmake b/modules/FindKDEWin.cmake index 9388713c..87076767 100644 --- a/modules/FindKDEWin.cmake +++ b/modules/FindKDEWin.cmake @@ -45,7 +45,11 @@ if (WIN32) if (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) set(KDEWIN_FOUND TRUE) # add needed system libs - set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) + if(NOT WINCE) + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) + else(NOT WINCE) + set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} ws2 ) + endif(NOT WINCE) if (MINGW) #mingw compiler @@ -54,7 +58,11 @@ if (WIN32) # msvc compiler # add the MS SDK include directory if available file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) - set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + if (WINCE) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${WCECOMPAT_INCLUDE_DIR} ${QT_INCLUDES} ${MSSDK_DIR}) + else(WINCE) + set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif(WINCE) endif (MINGW) endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 0aba8dc7..a4908ebb 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -1097,6 +1097,7 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) +if(NOT WINCE) FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE NAMES qdbuscpp2xml PATHS ${QT_BINARY_DIR} @@ -1108,6 +1109,19 @@ IF (QT4_QMAKE_FOUND) PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) +else(NOT WINCE) + FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE + NAMES qdbuscpp2xml + PATHS ${HOST_BINDIR} + NO_DEFAULT_PATH + ) + + FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE + NAMES qdbusxml2cpp + PATHS ${HOST_BINDIR} + NO_DEFAULT_PATH + ) +endif(NOT WINCE) FIND_PROGRAM(QT_LUPDATE_EXECUTABLE NAMES lupdate-qt4 lupdate diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index 4cc4334a..e9d8ce36 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -52,12 +52,20 @@ find_program(SOPRANO_SOPRANOCMD_EXECUTABLE ${KDE4_BIN_INSTALL_DIR} ) +if(NOT WINCE) find_program(SOPRANO_ONTO2VOCABULARYCLASS_EXECUTABLE NAMES onto2vocabularyclass HINTS ${BIN_INSTALL_DIR} ${KDE4_BIN_INSTALL_DIR} ) +else(NOT WINCE) +find_program(SOPRANO_ONTO2VOCABULARYCLASS_EXECUTABLE + NAMES onto2vocabularyclass + PATHS ${HOST_BINDIR} + NO_DEFAULT_PATH + ) +endif(NOT WINCE) find_path(SOPRANO_INCLUDE_DIR diff --git a/modules/FindWcecompat.cmake b/modules/FindWcecompat.cmake new file mode 100644 index 00000000..c9603470 --- /dev/null +++ b/modules/FindWcecompat.cmake @@ -0,0 +1,66 @@ +# Try to find Wcecompat functionality +# Once done this will define +# +# WCECOMPAT_FOUND - system has Wcecompat +# WCECOMPAT_INCLUDE_DIR - Wcecompat include directory +# WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat +# +# Copyright (c) 2010, Andreas Holzammer, <andy@kdab.com> +# +# Redistribution and use is allowed according to the terms of the BSD license. + +if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + set(Wcecompat_FIND_QUIETLY TRUE) +endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + +find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat) + +set(WCECOMPAT_LIB_FOUND FALSE) + +if(WCECOMPAT_INCLUDE_DIR) + find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex ) + + if(WCECOMPAT_LIBRARIES) + set(WCECOMPAT_LIB_FOUND TRUE) + endif(WCECOMPAT_LIBRARIES) +endif(WCECOMPAT_INCLUDE_DIR) + +# I have no idea what this is about, but it seems to be used quite often, so I add this here +set(WCECOMPAT_CONST const) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Wcecompat DEFAULT_MSG WCECOMPAT_LIBRARIES WCECOMPAT_LIB_FOUND) + +# Try to find Wcecompat functionality +# Once done this will define +# +# WCECOMPAT_FOUND - system has Wcecompat +# WCECOMPAT_INCLUDE_DIR - Wcecompat include directory +# WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat +# +# Copyright (c) 2010, Andreas Holzammer, <andy@kdab.com> +# +# Redistribution and use is allowed according to the terms of the BSD license. + +if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + set(Wcecompat_FIND_QUIETLY TRUE) +endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + +find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat) + +set(WCECOMPAT_LIB_FOUND FALSE) + +if(WCECOMPAT_INCLUDE_DIR) + find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex ) + + if(WCECOMPAT_LIBRARIES) + set(WCECOMPAT_LIB_FOUND TRUE) + endif(WCECOMPAT_LIBRARIES) +endif(WCECOMPAT_INCLUDE_DIR) + +# I have no idea what this is about, but it seems to be used quite often, so I add this here +set(WCECOMPAT_CONST const) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Wcecompat DEFAULT_MSG WCECOMPAT_LIBRARIES WCECOMPAT_LIB_FOUND) + |