Hi Alex, hi list,
i am trying to simplify compiling of kde on windows. for that i need to get
some changed into kdelibs/cmake/modules.
most of them add a cmake variable for the prefix where to find a library, like
gif, jpeg, etc.
and then there is a patch for findqt4.cmake.
the problem is, that the debug libs of qt 4 are nor found under windows,
because they are named Q<Foo>d4 for the debug libraries.
so for every Q<foo>4 in a find_library statement i added an Q<foo>d4 entry.
ok to commit ?
regards, Holger
Index: FindGIF.cmake
===================================================================
--- FindGIF.cmake (Revision 672234)
+++ FindGIF.cmake (Arbeitskopie)
@@ -14,11 +14,17 @@
SET(GIF_FIND_QUIETLY TRUE)
ENDIF (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
-FIND_PATH(GIF_INCLUDE_DIR gif_lib.h)
+FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
+ ${WIN32LIBS_INSTALL_PREFIX}/include
+)
-SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib)
-FIND_LIBRARY(GIF_LIBRARIES NAMES ${POTENTIAL_GIF_LIBS})
+SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4)
+FIND_LIBRARY(GIF_LIBRARIES NAMES ${POTENTIAL_GIF_LIBS}
+ PATHS
+ ${WIN32LIBS_INSTALL_PREFIX}/bin
+)
+
IF (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
SET(CMAKE_REQUIRED_INCLUDES "${GIF_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
CHECK_STRUCT_MEMBER(GifFileType UserData gif_lib.h GIF_FOUND)
Index: FindPCRE.cmake
===================================================================
--- FindPCRE.cmake (Revision 672234)
+++ FindPCRE.cmake (Arbeitskopie)
@@ -19,18 +19,21 @@
FIND_PATH(PCRE_INCLUDE_DIR pcre.h
/usr/include/
/usr/local/include/
+ ${WIN32LIBS_INSTALL_PREFIX}/include
)
FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
PATHS
/usr/lib
/usr/local/lib
+ ${WIN32LIBS_INSTALL_PREFIX}/lib
)
FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
PATHS
/usr/lib
/usr/local/lib
+ ${WIN32LIBS_INSTALL_PREFIX}/lib
)
set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
Index: FindSharedMimeInfo.cmake
===================================================================
--- FindSharedMimeInfo.cmake (Revision 672234)
+++ FindSharedMimeInfo.cmake (Arbeitskopie)
@@ -21,7 +21,10 @@
include (MacroEnsureVersion)
- find_program (UPDATE_MIME_DATABASE_EXECUTABLE NAMES update-mime-database)
+ find_program (UPDATE_MIME_DATABASE_EXECUTABLE NAMES update-mime-database
+ PATHS
+ ${SHARED_MIME_INFO_INSTALL_PREFIX}/bin
+ )
if (UPDATE_MIME_DATABASE_EXECUTABLE)
Index: FindLibXml2.cmake
===================================================================
--- FindLibXml2.cmake (Revision 672234)
+++ FindLibXml2.cmake (Arbeitskopie)
@@ -28,12 +28,14 @@
FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
PATHS
${_LibXml2IncDir}
+ ${WIN32LIBS_INSTALL_PREFIX}/include
PATH_SUFFIXES libxml2
)
FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
PATHS
${_LibXml2LinkDir}
+ ${WIN32LIBS_INSTALL_PREFIX}/lib
)
IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
Index: FindPNG.cmake
===================================================================
--- FindPNG.cmake (Revision 672234)
+++ FindPNG.cmake (Arbeitskopie)
@@ -24,12 +24,16 @@
/usr/local/include
/usr/include
/usr/local/include/libpng # OpenBSD
+ ${WIN32LIBS_INSTALL_PREFIX}/include
)
- SET(PNG_NAMES ${PNG_NAMES} png libpng)
+ SET(PNG_NAMES ${PNG_NAMES} png libpng png12)
FIND_LIBRARY(PNG_LIBRARY
NAMES ${PNG_NAMES}
- PATHS /usr/lib /usr/local/lib
+ PATHS
+ /usr/lib
+ /usr/local/lib
+ ${WIN32LIBS_INSTALL_PREFIX}/bin
)
IF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
Index: FindQt4.cmake
===================================================================
--- FindQt4.cmake (Revision 672234)
+++ FindQt4.cmake (Arbeitskopie)
@@ -643,13 +643,13 @@
ELSE (QT_USE_FRAMEWORKS)
# Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
- FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+ FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
# Set QT_QT3SUPPORT_LIBRARY
- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTGUI_LIBRARY
- FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTMOTIF_LIBRARY
IF(Q_WS_X11)
@@ -657,33 +657,33 @@
ENDIF(Q_WS_X11)
# Set QT_QTNETWORK_LIBRARY
- FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTNSPLUGIN_LIBRARY
FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTOPENGL_LIBRARY
- FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTSQL_LIBRARY
- FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTXML_LIBRARY
- FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTSVG_LIBRARY
- FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTSCRIPT_LIBRARY
- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTUITOOLS_LIBRARY
- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTTEST_LIBRARY
- FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
IF(MSVC)
FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -713,17 +713,17 @@
ENDIF( NOT QT_QTCORE_LIBRARY )
# Set QT_QTASSISTANT_LIBRARY
- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistantClientd4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTDESIGNER_LIBRARY
- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTDESIGNERCOMPONENTS_LIBRARY
- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTMAIN_LIBRARY
IF(WIN32)
- FIND_LIBRARY(QT_QTMAIN_LIBRARY NAMES qtmain PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTMAIN_LIBRARY NAMES qtmain qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
ENDIF(WIN32)
############################################
Index: FindKDEWIN32.cmake
===================================================================
--- FindKDEWIN32.cmake (Revision 672234)
+++ FindKDEWIN32.cmake (Arbeitskopie)
@@ -36,6 +36,7 @@
find_path(KDEWIN32_INCLUDE_DIR winposix_export.h
${KDEWIN32_DIR}/include
${CMAKE_INSTALL_PREFIX}/include
+ ${KDEWIN32_INSTALL_PREFIX}/include
)
# at first find the kdewin32 library, this has to be compiled and installed before kdelibs/
@@ -45,6 +46,7 @@
PATHS
${KDEWIN32_DIR}/lib
${CMAKE_INSTALL_PREFIX}/lib
+ ${KDEWIN32_INSTALL_PREFIX}/lib
NO_SYSTEM_ENVIRONMENT_PATH
)
@@ -52,6 +54,7 @@
PATHS
${KDEWIN32_DIR}/lib
${CMAKE_INSTALL_PREFIX}/lib
+ ${KDEWIN32_INSTALL_PREFIX}/lib
NO_SYSTEM_ENVIRONMENT_PATH
)
Index: FindStrigi.cmake
===================================================================
--- FindStrigi.cmake (Revision 672234)
+++ FindStrigi.cmake (Arbeitskopie)
@@ -18,18 +18,21 @@
$ENV{STRIGI_HOME}/include
${INCLUDE_INSTALL_DIR}
${_program_FILES_DIR}/strigi/include
+ ${STRIGI_INSTALL_PREFIX}/include
)
FIND_LIBRARY(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer
PATHS
$ENV{STRIGI_HOME}/lib
${LIB_INSTALL_DIR}
${_program_FILES_DIR}/strigi/lib
+ ${STRIGI_INSTALL_PREFIX}/lib
)
FIND_LIBRARY(STRIGI_STREAMS_LIBRARY NAMES streams
PATHS
$ENV{STRIGI_HOME}/lib
${LIB_INSTALL_DIR}
${_program_FILES_DIR}/strigi/lib
+ ${STRIGI_INSTALL_PREFIX}/lib
)
# for compatibility, remove ASAP (next BC monday), Alex
Index: FindLibXslt.cmake
===================================================================
--- FindLibXslt.cmake (Revision 672234)
+++ FindLibXslt.cmake (Arbeitskopie)
@@ -27,12 +27,15 @@
ENDIF (NOT WIN32)
FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
+ PATHS
${_LibXsltIncDir}
+ ${WIN32LIBS_INSTALL_PREFIX}/include
)
FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
PATHS
${_LibXsltLinkDir}
+ ${WIN32LIBS_INSTALL_PREFIX}/lib
)
IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
@@ -41,7 +44,10 @@
SET(LIBXSLT_FOUND FALSE)
ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
-FIND_PROGRAM(XSLTPROC_EXECUTABLE xsltproc)
+FIND_PROGRAM(XSLTPROC_EXECUTABLE xsltproc
+ PATHS
+ ${WIN32LIBS_INSTALL_PREFIX}/bin
+)
IF (LIBXSLT_FOUND)
IF (NOT LibXslt_FIND_QUIETLY)
_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem
