diff options
| author | Sebastian Sauer <mail@dipe.org> | 2006-10-22 05:46:55 +0000 |
|---|---|---|
| committer | Sebastian Sauer <mail@dipe.org> | 2006-10-22 05:46:55 +0000 |
| commit | d8edac17502c98d6841fe23a2dad6880468ab54d (patch) | |
| tree | 74b1db9b2c816e9e0ca034f332f294c3cb553987 | |
| parent | c77e98a3be18de55f920e8ad520cf27198e92e08 (diff) | |
| download | extra-cmake-modules-d8edac17502c98d6841fe23a2dad6880468ab54d.tar.gz extra-cmake-modules-d8edac17502c98d6841fe23a2dad6880468ab54d.tar.bz2 | |
Deactivated it again cause it seems to be the reason for probs with Qt 4.1.x while it seems to
be needed with Qt 4.2.x :-/
@Christian: could be find here a way to have it working for everybody? propably check for the
Qt-version or something like this?
CC_MAIL: Ch.Ehrlicher@gmx.de
svn path=/trunk/KDE/kdelibs/; revision=597951
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 4c3409af..b66b9f80 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -518,32 +518,31 @@ if (WIN32) # windows, mingw if(MINGW) - #TODO move such things either to FindKDEWIN32.cmake since it works with - #the kdewin32-package only anyway or have it direct with the Find*.cmake files (what could - #provide a problem for e.g. FindJPEG.cmake since I am pretty sure cmake.org does not like - #to take over our propably temporary workarounds). + #TODO: why does it break Qt 4.1.x? + move such code to FindKDEWIN32.cmake + #following is needed to get it compiling with Qt 4.2.1 + #see http://www.kdelibs.com/wiki/index.php/Building_KDElibs_4_using_GCC_and_MinGW_with_Qt_4.2 # FindZLIB.cmake - set(ZLIB_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(ZLIB_LIBRARY NAMES zlib PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(ZLIB_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(ZLIB_LIBRARY ${KDEWIN32_LIBRARY_PATH}/zlib) # FindPCRE.cmake - set(PCRE_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(PCRE_LIBRARIES NAMES pcre PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(PCRE_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(PCRE_LIBRARIES ${KDEWIN32_LIBRARY_PATH}/pcre) # FindLibXml2.cmake - set(LIBXML2_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(LIBXML2_LIBRARIES NAMES libxml2 PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(LIBXML2_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(LIBXML2_LIBRARIES ${KDEWIN32_LIBRARY_PATH}/libxml2) # FindLibXslt.cmake - set(LIBXSLT_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(LIBXSLT_LIBRARIES NAMES libxslt PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(LIBXSLT_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(LIBXSLT_LIBRARIES ${KDEWIN32_LIBRARY_PATH}/libxslt) # FindJPEG.cmake - set(JPEG_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(JPEG_LIBRARY NAMES jpeg PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(JPEG_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(JPEG_LIBRARY ${KDEWIN32_LIBRARY_PATH}/jpeg) # FindGIF.cmake - set(GIF_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(GIF_LIBRARIES NAMES giflib PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(GIF_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(GIF_LIBRARIES ${KDEWIN32_LIBRARY_PATH}/giflib) # FindPNG.cmake - set(PNG_PNG_INCLUDE_DIR ${KDEWIN32_INCLUDES}) - find_library(PNG_LIBRARY NAMES libpng PATHS ${KDEWIN32_LIBRARY_PATH}) + #set(PNG_PNG_INCLUDE_DIR ${KDEWIN32_INCLUDES}) + #set(PNG_LIBRARY ${KDEWIN32_LIBRARY_PATH}/libpng) endif(MINGW) # windows, microsoft compiler |