From 7c7a0e07ca201f1f5dd51bf87d6c023dc9dc28f0 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 22 Jan 2006 10:29:20 +0000 Subject: -generate_findpackage_file: a script to simplify generating simple FindFoo.cmake files -FindLibXml2.cmake and FindLibXslt.cmake: modules to find libxml2 and libxslt, generated by the script above -some tuning in the other modules Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=501125 --- modules/FindLibXml2.cmake | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 modules/FindLibXml2.cmake (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake new file mode 100644 index 00000000..37486afc --- /dev/null +++ b/modules/FindLibXml2.cmake @@ -0,0 +1,45 @@ +# - Try to find LibXml2 +# Once done this will define +# +# LIBXML2_FOUND - system has LibXml2 +# LIBXML2_INCLUDE_DIR - the LibXml2 include directory +# LIBXML2_LIBRARY - Link these to use OpenGL and GLU +# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 +# +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls + + +INCLUDE(UsePkgConfig) + +PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) + +SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) + +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + ${_LibXml2IncDir}/libxml2 + /usr/include/libxml2 + /usr/local/include/libxml2 +) + +FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 + PATHS + ${_LibXml2LinkDir} + /usr/lib + /usr/local/lib +) + +IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) + SET(LIBXML2_FOUND TRUE) +ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) + +IF(LIBXML2_FOUND) + IF(NOT LIBXML2_QUIETLY) + MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARY}") + ENDIF(NOT LIBXML2_QUIETLY) +ELSE(LIBXML2_FOUND) + IF(NOT LIBXML2_REQUIRED) + MESSAGE(SEND_ERROR "Could not find LibXml2") + ENDIF(NOT LIBXML2_REQUIRED) +ENDIF(LIBXML2_FOUND) + -- cgit v1.2.1 From f966ce265b1c469713f7c2543bb81e5cf8b70d13 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 23 Jan 2006 17:41:24 +0000 Subject: -fix Foo_FIND_REQUIRED and Foo_FIND_QUIETYL handling: Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=501687 --- modules/FindLibXml2.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 37486afc..4be22454 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -34,12 +34,12 @@ IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) IF(LIBXML2_FOUND) - IF(NOT LIBXML2_QUIETLY) + IF(NOT LibXml2_FIND_QUIETLY) MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARY}") - ENDIF(NOT LIBXML2_QUIETLY) + ENDIF(NOT LibXml2_FIND_QUIETLY) ELSE(LIBXML2_FOUND) - IF(NOT LIBXML2_REQUIRED) + IF(LibXml2_FIND_REQUIRED) MESSAGE(SEND_ERROR "Could not find LibXml2") - ENDIF(NOT LIBXML2_REQUIRED) + ENDIF(LibXml2_FIND_REQUIRED) ENDIF(LIBXML2_FOUND) -- cgit v1.2.1 From 8ad0121573a771ded4fd6dccc754eb5cfd3661af Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Wed, 8 Feb 2006 19:46:50 +0000 Subject: add some libnames svn path=/trunk/KDE/kdelibs/; revision=507241 --- modules/FindLibXml2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 4be22454..5dca3a19 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -22,7 +22,7 @@ FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h /usr/local/include/libxml2 ) -FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 +FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 libxml2 PATHS ${_LibXml2LinkDir} /usr/lib -- cgit v1.2.1 From b7c52832df7c32dec7d6e6183ef469efef0f3845 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 10 Feb 2006 08:23:31 +0000 Subject: added CMAKE_INCLUDE_PATH related path check for include files svn path=/trunk/KDE/kdelibs/; revision=507831 --- modules/FindLibXml2.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 5dca3a19..5aade097 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -17,6 +17,7 @@ PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cf SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + ${CMAKE_INCLUDE_PATH}/libxml2 ${_LibXml2IncDir}/libxml2 /usr/include/libxml2 /usr/local/include/libxml2 -- cgit v1.2.1 From cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 11 Feb 2006 20:19:59 +0000 Subject: -changed kde4_create_libtool_file (target dir_relative_to_libdir) to kde4_install_libtool_file(dir_relative_to_install_prefix target) -added variable KDE4_PLUGIN_INSTALL_DIR, used usually for installing plugins -changed am2cmake accordingly -edited FindLibXml2.cmake and FindLibArt so that they work correctly with CMAKE_INSTALL_PATH -changed generated_findpackage_file accordingly -some minor formatting changes Alex CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=508458 --- modules/FindLibXml2.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 5aade097..122e2f8c 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -16,13 +16,16 @@ PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cf SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - ${CMAKE_INCLUDE_PATH}/libxml2 - ${_LibXml2IncDir}/libxml2 - /usr/include/libxml2 - /usr/local/include/libxml2 +FIND_PATH(LIBXML2_ROOT_INCLUDE_DIR libxml2/libxml/xpath.h + ${_LibXml2IncDir} + /usr/include + /usr/local/include ) +SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT_INCLUDE_DIR}/libxml2 CACHE PATH "LibXml2 include directory") + +MARK_AS_ADVANCED(LIBXML2_ROOT_INCLUDE_DIR) + FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 libxml2 PATHS ${_LibXml2LinkDir} -- cgit v1.2.1 From bce40e0de3b22a291ecaa2b75358e6a998e1579b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 11 Feb 2006 20:48:29 +0000 Subject: workaround for detecting libxml2 on windows when using a path list in CMAKE_INCLUDE_PATH svn path=/trunk/KDE/kdelibs/; revision=508470 --- modules/FindLibXml2.cmake | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 122e2f8c..b40635c8 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -15,23 +15,16 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) - -FIND_PATH(LIBXML2_ROOT_INCLUDE_DIR libxml2/libxml/xpath.h - ${_LibXml2IncDir} - /usr/include - /usr/local/include -) - -SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT_INCLUDE_DIR}/libxml2 CACHE PATH "LibXml2 include directory") - -MARK_AS_ADVANCED(LIBXML2_ROOT_INCLUDE_DIR) - -FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 libxml2 - PATHS - ${_LibXml2LinkDir} - /usr/lib - /usr/local/lib -) + +# this is a hack dealing with lists in CMAKE_INCLUDE_PATH +foreach(incDir ${CMAKE_INCLUDE_PATH}) + FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + ${incDir}/libxml2 + ${_LibXml2IncDir}/libxml2 + /usr/include/libxml2 + /usr/local/include/libxml2 + ) +endforeach(incDir ${CMAKE_INCLUDE_PATH}) IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) SET(LIBXML2_FOUND TRUE) -- cgit v1.2.1 From 75a07dd38b4a491a9d16d24492bea5c6ba90a8ff Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 12 Feb 2006 14:38:04 +0000 Subject: -moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its own FindKDEWIN32.cmake file -added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory -changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules -added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables -modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc -all tests compile and link Alex CCMAIL:kde-buildsystem@kde.org The changes to the windows stuff are untested, since I don't have a windows box. Please check that everything still works. Please have a look at FindGNUWIN32.cmake, there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other cmake modules as default path to search for headers and libraries. svn path=/trunk/KDE/kdelibs/; revision=508648 --- modules/FindLibXml2.cmake | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index b40635c8..0ccd8ca2 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -3,7 +3,7 @@ # # LIBXML2_FOUND - system has LibXml2 # LIBXML2_INCLUDE_DIR - the LibXml2 include directory -# LIBXML2_LIBRARY - Link these to use OpenGL and GLU +# LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 # # use pkg-config to get the directories and then use these values @@ -15,24 +15,31 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) - -# this is a hack dealing with lists in CMAKE_INCLUDE_PATH -foreach(incDir ${CMAKE_INCLUDE_PATH}) - FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - ${incDir}/libxml2 - ${_LibXml2IncDir}/libxml2 - /usr/include/libxml2 - /usr/local/include/libxml2 - ) -endforeach(incDir ${CMAKE_INCLUDE_PATH}) - -IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) + +FIND_PACKAGE(GNUWIN32) + +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + ${_LibXml2IncDir}/libxml2 + /usr/include/libxml2 + /usr/local/include/libxml2 + ${GNUWIN32_DIR}/include/libxml2 +) + +FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 + PATHS + ${_LibXml2LinkDir} + /usr/lib + /usr/local/lib + ${GNUWIN32_DIR}/lib +) + +IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) SET(LIBXML2_FOUND TRUE) -ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY) +ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) IF(LIBXML2_FOUND) IF(NOT LibXml2_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARY}") + MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") ENDIF(NOT LibXml2_FIND_QUIETLY) ELSE(LIBXML2_FOUND) IF(LibXml2_FIND_REQUIRED) @@ -40,3 +47,4 @@ ELSE(LIBXML2_FOUND) ENDIF(LibXml2_FIND_REQUIRED) ENDIF(LIBXML2_FOUND) +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) \ No newline at end of file -- cgit v1.2.1 From ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:47:36 +0000 Subject: Lowercase some common keywords to improve readability svn path=/trunk/KDE/kdelibs/; revision=509624 --- modules/FindLibXml2.cmake | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 0ccd8ca2..89737bb6 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -14,7 +14,7 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) -SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) FIND_PACKAGE(GNUWIN32) @@ -33,18 +33,18 @@ FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 ${GNUWIN32_DIR}/lib ) -IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND TRUE) -ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - -IF(LIBXML2_FOUND) - IF(NOT LibXml2_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - ENDIF(NOT LibXml2_FIND_QUIETLY) -ELSE(LIBXML2_FOUND) - IF(LibXml2_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could not find LibXml2") - ENDIF(LibXml2_FIND_REQUIRED) -ENDIF(LIBXML2_FOUND) +if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + set(LIBXML2_FOUND TRUE) +endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +if(LIBXML2_FOUND) + if(not LibXml2_FIND_QUIETLY) + message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + endif(not LibXml2_FIND_QUIETLY) +else(LIBXML2_FOUND) + if(LibXml2_FIND_REQUIRED) + message(SEND_ERROR "Could not find LibXml2") + endif(LibXml2_FIND_REQUIRED) +endif(LIBXML2_FOUND) MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) \ No newline at end of file -- cgit v1.2.1 From eaad615ee85800bedbf2088326399027c95d0740 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:49:53 +0000 Subject: Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, of course... svn path=/trunk/KDE/kdelibs/; revision=509625 --- modules/FindLibXml2.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 89737bb6..c25cc7e2 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -38,12 +38,12 @@ if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) if(LIBXML2_FOUND) - if(not LibXml2_FIND_QUIETLY) + if(NOT LibXml2_FIND_QUIETLY) message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - endif(not LibXml2_FIND_QUIETLY) + endif(NOT LibXml2_FIND_QUIETLY) else(LIBXML2_FOUND) if(LibXml2_FIND_REQUIRED) - message(SEND_ERROR "Could not find LibXml2") + message(SEND_ERROR "Could NOT find LibXml2") endif(LibXml2_FIND_REQUIRED) endif(LIBXML2_FOUND) -- cgit v1.2.1 From 191846e3e21c697c28bd5c8a166edeb4072161e3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 20 Mar 2006 21:05:37 +0000 Subject: minor cleanups: indenting, adding newline to end of file, etc. svn path=/trunk/KDE/kdelibs/; revision=520790 --- modules/FindLibXml2.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index c25cc7e2..d6214d76 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -33,18 +33,18 @@ FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 ${GNUWIN32_DIR}/lib ) -if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) +if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) set(LIBXML2_FOUND TRUE) -endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) +endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -if(LIBXML2_FOUND) - if(NOT LibXml2_FIND_QUIETLY) +if (LIBXML2_FOUND) + if (NOT LibXml2_FIND_QUIETLY) message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - endif(NOT LibXml2_FIND_QUIETLY) -else(LIBXML2_FOUND) - if(LibXml2_FIND_REQUIRED) + endif (NOT LibXml2_FIND_QUIETLY) +else (LIBXML2_FOUND) + if (LibXml2_FIND_REQUIRED) message(SEND_ERROR "Could NOT find LibXml2") - endif(LibXml2_FIND_REQUIRED) -endif(LIBXML2_FOUND) + endif (LibXml2_FIND_REQUIRED) +endif (LIBXML2_FOUND) -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) \ No newline at end of file +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) -- cgit v1.2.1 From 402025260c2a8fddfabd642c979deac99b8cdf60 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 21 Mar 2006 20:11:33 +0000 Subject: -change FindLibXml2.cmake to the new enhanced cmake style by using PATH_SUFFIXES for linux/bsd/OS X developers this shouldn't change anything ...but for the windows developers it should ! So: for the stuff which comes from gnuwin32: set the environment variable CMAKE_LIBRARY_PATH to the directory where the gnuwin32 libs are located and set CMAKE_INCLUDE_PATH to the directory where the gnuwin32 headers are installed to. Please let me know whether this works for. So, don't set CMAKE_INCLUDE_PATH to the directory which contains libxml/xpath.h, but to the one which contains libxml2/libxml/xpath.h This should make writing the FindSomething.cmake modules much easier. CCMAIL: kde-buildsystem@kde.org CCMAIL: Ch.Ehrlicher@gmx.de CCMAIL: ralf.habacker@freenet.de CCMAIL: syntheticpp@gmx.net Alex svn path=/trunk/KDE/kdelibs/; revision=521183 --- modules/FindLibXml2.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index d6214d76..7bc10d79 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -16,21 +16,15 @@ PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cf set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -FIND_PACKAGE(GNUWIN32) - FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - ${_LibXml2IncDir}/libxml2 - /usr/include/libxml2 - /usr/local/include/libxml2 - ${GNUWIN32_DIR}/include/libxml2 + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS ${_LibXml2LinkDir} - /usr/lib - /usr/local/lib - ${GNUWIN32_DIR}/lib ) if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From b3389e6dba49823c71faa20fb168897422c1df50 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 8 Apr 2006 12:54:55 +0000 Subject: limit gnuwin32 package to windows svn path=/trunk/KDE/kdelibs/; revision=527490 --- modules/FindLibXml2.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 7bc10d79..a5d8ab17 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -6,13 +6,17 @@ # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 # -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls - -INCLUDE(UsePkgConfig) - -PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) +IF (WIN32) + FIND_PACKAGE(GNUWIN32) + SET(_LibXml2IncDir ${GNUWIN32_DIR}/include) + SET(_LibXml2LinkDir ${GNUWIN32_DIR}/lib) +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(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) +ENDIF (WIN32) set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -- cgit v1.2.1 From cba8933a83c2e96698b85b980438f30385f8420e Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 8 Apr 2006 22:43:16 +0000 Subject: optimized gnuwin32 detection on windows - find gnuwin32 package location very early - removed GNUWIN32_INCLUDE_DIR/GNUWIN32_LIBRARY_DIR macros, because FindGNUWIN32.cmake sets now CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH - don't use pkgconfig on windows svn path=/trunk/KDE/kdelibs/; revision=527634 --- modules/FindLibXml2.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index a5d8ab17..deb09c65 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -7,18 +7,13 @@ # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 # -IF (WIN32) - FIND_PACKAGE(GNUWIN32) - SET(_LibXml2IncDir ${GNUWIN32_DIR}/include) - SET(_LibXml2LinkDir ${GNUWIN32_DIR}/lib) -ELSE (WIN32) +IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) -ENDIF (WIN32) - -set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) + set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h PATHS -- cgit v1.2.1 From 968fec0a7b604bb1c463aae6ff7bb9726407af72 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 14 Apr 2006 11:49:02 +0000 Subject: Actually use the cache whenever possible. Should speed up the re-configuring that happens so often. svn path=/trunk/KDE/kdelibs/; revision=529759 --- modules/FindLibXml2.cmake | 85 ++++++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 35 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index deb09c65..b7914be1 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -5,39 +5,54 @@ # LIBXML2_INCLUDE_DIR - the LibXml2 include directory # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 -# -IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) - set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -ENDIF (NOT WIN32) - -FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS - ${_LibXml2IncDir} - PATH_SUFFIXES libxml2 -) - -FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS - ${_LibXml2LinkDir} -) - -if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - set(LIBXML2_FOUND TRUE) -endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - -if (LIBXML2_FOUND) - if (NOT LibXml2_FIND_QUIETLY) - message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - endif (NOT LibXml2_FIND_QUIETLY) -else (LIBXML2_FOUND) - if (LibXml2_FIND_REQUIRED) - message(SEND_ERROR "Could NOT find LibXml2") - endif (LibXml2_FIND_REQUIRED) -endif (LIBXML2_FOUND) - -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) +IF (CACHED_LIBXML2) + + # in cache already + IF ("${CACHED_LIBXML2}" STREQUAL "YES") + SET(LIBXML2_FOUND TRUE) + ENDIF ("${CACHED_LIBXML2}" STREQUAL "YES") + +ELSE (CACHED_LIBXML2) + + IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) + set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) + ENDIF (NOT WIN32) + + FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 + ) + + FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 + PATHS + ${_LibXml2LinkDir} + ) + + if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + set(LIBXML2_FOUND TRUE) + set(CACHED_LIBXML2 "YES") + else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + set(CACHED_LIBXML2 "NO") + endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + + if (LIBXML2_FOUND) + if (NOT LibXml2_FIND_QUIETLY) + message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + endif (NOT LibXml2_FIND_QUIETLY) + else (LIBXML2_FOUND) + if (LibXml2_FIND_REQUIRED) + message(SEND_ERROR "Could NOT find LibXml2") + endif (LibXml2_FIND_REQUIRED) + endif (LIBXML2_FOUND) + + MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) + + SET(CACHED_LIBXML2 ${CACHED_LIBXML2} CACHE INTERNAL "If libxml2 was checked") + +ENDIF (CACHED_LIBXML2) -- cgit v1.2.1 From 2b43aad081d13bdeb2ed8a65f65fbecfb470da0d Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Apr 2006 11:22:38 +0000 Subject: More use of the cache; fixing previous commit to not recheck everytime when something isn't available (e.g. agg for me). svn path=/trunk/KDE/kdelibs/; revision=531000 --- modules/FindLibXml2.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index b7914be1..2e671eea 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -6,14 +6,14 @@ # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 -IF (CACHED_LIBXML2) +IF (DEFINED CACHED_LIBXML2) # in cache already IF ("${CACHED_LIBXML2}" STREQUAL "YES") SET(LIBXML2_FOUND TRUE) ENDIF ("${CACHED_LIBXML2}" STREQUAL "YES") -ELSE (CACHED_LIBXML2) +ELSE (DEFINED CACHED_LIBXML2) IF (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -55,4 +55,4 @@ ELSE (CACHED_LIBXML2) SET(CACHED_LIBXML2 ${CACHED_LIBXML2} CACHE INTERNAL "If libxml2 was checked") -ENDIF (CACHED_LIBXML2) +ENDIF (DEFINED CACHED_LIBXML2) -- cgit v1.2.1 From a1cd53cff402332c1bcf7a625b33d9330a247608 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 11 May 2006 16:56:59 +0000 Subject: Remove my CACHED_ hacks which break when people install libxml2 after seeing the error message about it - only use the cache when the check was previously successful, as discussed. svn path=/trunk/KDE/kdelibs/; revision=539759 --- modules/FindLibXml2.cmake | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 2e671eea..29682e07 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -6,14 +6,12 @@ # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 -IF (DEFINED CACHED_LIBXML2) +if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) # in cache already - IF ("${CACHED_LIBXML2}" STREQUAL "YES") - SET(LIBXML2_FOUND TRUE) - ENDIF ("${CACHED_LIBXML2}" STREQUAL "YES") + SET(LIBXML2_FOUND TRUE) -ELSE (DEFINED CACHED_LIBXML2) +else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -36,9 +34,6 @@ ELSE (DEFINED CACHED_LIBXML2) if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) set(LIBXML2_FOUND TRUE) - set(CACHED_LIBXML2 "YES") - else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - set(CACHED_LIBXML2 "NO") endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) if (LIBXML2_FOUND) @@ -53,6 +48,4 @@ ELSE (DEFINED CACHED_LIBXML2) MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) - SET(CACHED_LIBXML2 ${CACHED_LIBXML2} CACHE INTERNAL "If libxml2 was checked") - -ENDIF (DEFINED CACHED_LIBXML2) +endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From 23455a0ebf1a944a4b00bde65074fea3d3c04e82 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 4 Sep 2006 21:40:24 +0000 Subject: Add a short version of the BSD copyright notice. Is it ok that way ? I just reference licenses/BSD without further explanation where to find the licenses/ subdirectory. This is legal stuff, so I could need some good advice from somebody who knows this better than me. The BSD license in kdelibs/licenses/BSD also doesn't contain the no-endorsement clause: # The name of the author may not be used to endorse or promote products # derived from this software without specific prior written permission. Is there a special reason why it doesn't ? If I would like to have this clause too, do I need to add another license file to licenses/ or should I simply put it in the same directory as the cmake scripts ? Then one could simply state: # This code is available under the BSD license, see the accompanying cmake-script-licensing. So, what's the correct and best way to deal with this ? Alex CCMAIL: kde-core-devel@kde.org svn path=/trunk/KDE/kdelibs/; revision=580959 --- modules/FindLibXml2.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 29682e07..037ab383 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -5,6 +5,9 @@ # LIBXML2_INCLUDE_DIR - the LibXml2 include directory # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 +# +# Copyright (c) 2006, Alexander Neundorf +# This code is available under the BSD license, see licenses/BSD for details. if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindLibXml2.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 037ab383..a1fb8b42 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -8,6 +8,12 @@ # # Copyright (c) 2006, Alexander Neundorf # This code is available under the BSD license, see licenses/BSD for details. +# +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From 1511cad3ffbbb7548a6fa9662aac13620facd5cc Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 19 Sep 2006 20:00:35 +0000 Subject: prepare for merging to cmake Alex svn path=/trunk/KDE/kdelibs/; revision=586500 --- modules/FindLibXml2.cmake | 85 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 43 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index a1fb8b42..b45d7293 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -8,53 +8,52 @@ # # Copyright (c) 2006, Alexander Neundorf # This code is available under the BSD license, see licenses/BSD for details. -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - # in cache already - SET(LIBXML2_FOUND TRUE) - -else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) - set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) - ENDIF (NOT WIN32) - - FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS - ${_LibXml2IncDir} - PATH_SUFFIXES libxml2 - ) - - FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS - ${_LibXml2LinkDir} - ) - - if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - set(LIBXML2_FOUND TRUE) - endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - - if (LIBXML2_FOUND) - if (NOT LibXml2_FIND_QUIETLY) - message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - endif (NOT LibXml2_FIND_QUIETLY) - else (LIBXML2_FOUND) - if (LibXml2_FIND_REQUIRED) - message(SEND_ERROR "Could NOT find LibXml2") - endif (LibXml2_FIND_REQUIRED) - endif (LIBXML2_FOUND) - - MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + # in cache already + SET(LibXml2_FIND_QUIETLY TRUE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) + SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +ENDIF (NOT WIN32) + +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 + ) + +FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 + PATHS + ${_LibXml2LinkDir} + ) + +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND TRUE) +ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND FALSE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (LIBXML2_FOUND) + IF (NOT LibXml2_FIND_QUIETLY) + MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + ENDIF (NOT LibXml2_FIND_QUIETLY) +ELSE (LIBXML2_FOUND) + IF (LibXml2_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find LibXml2") + ENDIF (LibXml2_FIND_REQUIRED) +ENDIF (LIBXML2_FOUND) + +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) -endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From 66b05f70b209fb8db4e8e9a2f2f8064c5e55ed59 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 13 Dec 2006 20:57:33 +0000 Subject: I don't need the copyright twice ;-) Alex svn path=/trunk/KDE/kdelibs/; revision=613313 --- modules/FindLibXml2.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index b45d7293..47136df0 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -5,9 +5,6 @@ # LIBXML2_INCLUDE_DIR - the LibXml2 include directory # LIBXML2_LIBRARIES - the libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 -# -# Copyright (c) 2006, Alexander Neundorf -# This code is available under the BSD license, see licenses/BSD for details. # Copyright (c) 2006, Alexander Neundorf, # -- cgit v1.2.1 From 1fb5bcae073e078d25bbd6858cc416759b9de47e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 27 Jan 2007 12:55:29 +0000 Subject: Remove module which are now into cmake-2.4.5 FindLibXslt.cmake can be remove there is different from cmake file (test xsltproc) and FindOpenSSL.cmake (I must look at difference) svn path=/trunk/KDE/kdelibs/; revision=627623 --- modules/FindLibXml2.cmake | 56 ----------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 modules/FindLibXml2.cmake (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake deleted file mode 100644 index 47136df0..00000000 --- a/modules/FindLibXml2.cmake +++ /dev/null @@ -1,56 +0,0 @@ -# - Try to find LibXml2 -# Once done this will define -# -# LIBXML2_FOUND - system has LibXml2 -# LIBXML2_INCLUDE_DIR - the LibXml2 include directory -# LIBXML2_LIBRARIES - the libraries needed to use LibXml2 -# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 - -# Copyright (c) 2006, Alexander Neundorf, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - # in cache already - SET(LibXml2_FIND_QUIETLY TRUE) -ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - -IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) - SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -ENDIF (NOT WIN32) - -FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS - ${_LibXml2IncDir} - PATH_SUFFIXES libxml2 - ) - -FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS - ${_LibXml2LinkDir} - ) - -IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND TRUE) -ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND FALSE) -ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - -IF (LIBXML2_FOUND) - IF (NOT LibXml2_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - ENDIF (NOT LibXml2_FIND_QUIETLY) -ELSE (LIBXML2_FOUND) - IF (LibXml2_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could NOT find LibXml2") - ENDIF (LibXml2_FIND_REQUIRED) -ENDIF (LIBXML2_FOUND) - -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) - -- cgit v1.2.1 From 923ea3d1931fb19628575b453889e026b6a706fe Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 28 Jan 2007 21:00:21 +0000 Subject: -revert commit from Laurent, we have to discuss requiring cmake 2.4.5 (or 2.4.6) first before requiting it Alex CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=628019 --- modules/FindLibXml2.cmake | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 modules/FindLibXml2.cmake (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake new file mode 100644 index 00000000..47136df0 --- /dev/null +++ b/modules/FindLibXml2.cmake @@ -0,0 +1,56 @@ +# - Try to find LibXml2 +# Once done this will define +# +# LIBXML2_FOUND - system has LibXml2 +# LIBXML2_INCLUDE_DIR - the LibXml2 include directory +# LIBXML2_LIBRARIES - the libraries needed to use LibXml2 +# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 + +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + # in cache already + SET(LibXml2_FIND_QUIETLY TRUE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) + SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +ENDIF (NOT WIN32) + +FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 + ) + +FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 + PATHS + ${_LibXml2LinkDir} + ) + +IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND TRUE) +ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + SET(LIBXML2_FOUND FALSE) +ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +IF (LIBXML2_FOUND) + IF (NOT LibXml2_FIND_QUIETLY) + MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + ENDIF (NOT LibXml2_FIND_QUIETLY) +ELSE (LIBXML2_FOUND) + IF (LibXml2_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find LibXml2") + ENDIF (LibXml2_FIND_REQUIRED) +ENDIF (LIBXML2_FOUND) + +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) + -- cgit v1.2.1 From 76d561845a112d3196cf67770b23e7a9a5180cf9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 29 Jan 2007 21:41:17 +0000 Subject: Search xmllint program (need to check doc generated file) svn path=/trunk/KDE/kdelibs/; revision=628365 --- modules/FindLibXml2.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 47136df0..a820a235 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -42,6 +42,12 @@ ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) SET(LIBXML2_FOUND FALSE) ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) +FIND_PROGRAM(XSLTPROC_EXECUTABLE xmllint) + +if( NOT XSLTPROC_EXECUTABLE ) + MESSAGE(STATUS "xmllint program not found. Install it if you want validate generated doc file.") +endif(NOT XSLTPROC_EXECUTABLE ) + IF (LIBXML2_FOUND) IF (NOT LibXml2_FIND_QUIETLY) MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") -- cgit v1.2.1 From 7cc0225bc6d352d0fd3b7b697f51f1364207e05a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 29 Jan 2007 21:53:35 +0000 Subject: Fix typo svn path=/trunk/KDE/kdelibs/; revision=628370 --- modules/FindLibXml2.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index a820a235..f74cbb58 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -42,11 +42,11 @@ ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) SET(LIBXML2_FOUND FALSE) ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -FIND_PROGRAM(XSLTPROC_EXECUTABLE xmllint) +FIND_PROGRAM(XMLLINT_EXECUTABLE xmllint) -if( NOT XSLTPROC_EXECUTABLE ) +if( NOT XMLLINT_EXECUTABLE ) MESSAGE(STATUS "xmllint program not found. Install it if you want validate generated doc file.") -endif(NOT XSLTPROC_EXECUTABLE ) +endif(NOT XMLLINT_EXECUTABLE ) IF (LIBXML2_FOUND) IF (NOT LibXml2_FIND_QUIETLY) -- cgit v1.2.1 From bc80c43ccfc1d85d9929b7bb8c4b6cd69c942a14 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 17 Dec 2007 20:05:52 +0000 Subject: -mark more variables as advanced -some cosmetics (indentation etc.) Alex svn path=/trunk/KDE/kdelibs/; revision=749753 --- modules/FindLibXml2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index f74cbb58..5f23c184 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -58,5 +58,5 @@ ELSE (LIBXML2_FOUND) ENDIF (LibXml2_FIND_REQUIRED) ENDIF (LIBXML2_FOUND) -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES XMLLINT_EXECUTABLE) -- cgit v1.2.1 From 08639d2275bd5b3fa5e479f3c2020d5269ee5a9b Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 20 Jul 2008 10:35:34 +0000 Subject: -rename XMLLINT_EXECUTABLE to LIBXML2_XMLLINT_EXECUTABLE so it follows the styleguide for cmake modules and is properly prefixed -document LIBXML2_XMLLINT_EXECUTABLE -keep XMLLINT_EXECUTABLE for backwards compat. with KDE 4.0.x -consistent casing -adapt config-kdoctools.h.cmake to LIBXML2_XMLLINT_EXECUTABLE Alex svn path=/trunk/KDE/kdelibs/; revision=835259 --- modules/FindLibXml2.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 5f23c184..bbe5e8b2 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -1,10 +1,11 @@ # - Try to find LibXml2 # Once done this will define # -# LIBXML2_FOUND - system has LibXml2 -# LIBXML2_INCLUDE_DIR - the LibXml2 include directory -# LIBXML2_LIBRARIES - the libraries needed to use LibXml2 +# LIBXML2_FOUND - System has LibXml2 +# LIBXML2_INCLUDE_DIR - The LibXml2 include directory +# LIBXML2_LIBRARIES - The libraries needed to use LibXml2 # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 +# LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming with LibXml2 # Copyright (c) 2006, Alexander Neundorf, # @@ -42,11 +43,13 @@ ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) SET(LIBXML2_FOUND FALSE) ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -FIND_PROGRAM(XMLLINT_EXECUTABLE xmllint) +FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint) +# for backwards compat. with KDE 4.0.x: +SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}") -if( NOT XMLLINT_EXECUTABLE ) +IF( NOT LIBXML2_XMLLINT_EXECUTABLE ) MESSAGE(STATUS "xmllint program not found. Install it if you want validate generated doc file.") -endif(NOT XMLLINT_EXECUTABLE ) +ENDIF(NOT LIBXML2_XMLLINT_EXECUTABLE ) IF (LIBXML2_FOUND) IF (NOT LibXml2_FIND_QUIETLY) @@ -58,5 +61,5 @@ ELSE (LIBXML2_FOUND) ENDIF (LibXml2_FIND_REQUIRED) ENDIF (LIBXML2_FOUND) -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES XMLLINT_EXECUTABLE) +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE) -- cgit v1.2.1 From d69178fdea07d3f16dd8aa368f28aa20a83d3015 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 12:38:50 +0000 Subject: Port them too svn path=/trunk/KDE/kdelibs/; revision=882802 --- modules/FindLibXml2.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index bbe5e8b2..8615e77b 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -21,20 +21,20 @@ ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) - SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) + find_package(PkgConfig) + pkg_check_modules(LIBXML libxml-2.0) + SET(LIBXML2_DEFINITIONS ${LIBXML_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h PATHS - ${_LibXml2IncDir} + ${LIBXML_INCLUDE_DIRS} PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS - ${_LibXml2LinkDir} + ${LIBXML_LIBRARY_DIRS} ) IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From 877046103ca395ba7b2d842fd00404869e54bef0 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 18 Nov 2008 21:58:50 +0000 Subject: -use the prefix PC_ for the variables coming from pkgconfig (these three modules were working correctly, this is just to establish a convention how to deal with this) Alex svn path=/trunk/KDE/kdelibs/; revision=886256 --- modules/FindLibXml2.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 8615e77b..1849e099 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -22,19 +22,19 @@ IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(LIBXML libxml-2.0) - SET(LIBXML2_DEFINITIONS ${LIBXML_CFLAGS}) + pkg_check_modules(PC_LIBXML libxml-2.0) + SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h PATHS - ${LIBXML_INCLUDE_DIRS} + ${PC_LIBXML_INCLUDE_DIRS} PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS - ${LIBXML_LIBRARY_DIRS} + ${PC_LIBXML_LIBRARY_DIRS} ) IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1 From c379d4c4e0655fac2dadd4be57e2e5cd23d40572 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 2 Dec 2008 21:49:01 +0000 Subject: -rework all uses of find_package(PkgConfig)/pkg_check_modules(): the prefix used for pkgconfig config (e.g. SQLITE) now *always* gets an additional "PC_" prefix, so the prefix used for pkgconfig is now "PC_SQLITE_". This avoids name clashes between variables defined by the pkgconfig macro and the find module and unwanted effects. *Never* use the _CFLAGS coming from pkgconfig, but always CFLAGS_OTHER, since these shouldn't contain the include directories. If the include directories would be in the DEFINITIONS variable this could clash with the results of find_path() for finding include dirs. *Always* use both foo_INCLUDEDIR, foo_INCLUDE_DIRS for searching the include dir, and also both foo_LIBDIR and foo_LIBRARY_DIRS for searching the libraries. These directories coming from pkgconfig are *never* used exclusively, but *always* additionally to the standard search dirs, either before them (then using the "HINTS" keyword) or after them (then using the "PATHS" keyword) I hope I didn't break (too much) stuff. At least on my system it all seems to work the same way as it did before, with and without pkgconfig. Alex svn path=/trunk/KDE/kdelibs/; revision=891805 --- modules/FindLibXml2.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 1849e099..04a73857 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -23,17 +23,19 @@ IF (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) pkg_check_modules(PC_LIBXML libxml-2.0) - SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS}) + SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS + HINTS + ${PC_LIBXML_INCLUDEDIR} ${PC_LIBXML_INCLUDE_DIRS} PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS + HINTS + ${PC_LIBXML_LIBDIR} ${PC_LIBXML_LIBRARY_DIRS} ) -- cgit v1.2.1 From bfa11e38bd5e34283ab55c318f2ca3b66457d84b Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 22 Dec 2008 07:52:21 +0000 Subject: -delete FindPNG.cmake and FindTIFF.cmake, they are synced with the ones from cmake 2.6.2 -use the find_package_handle_standards_args() macro in FindLibXml2.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=900078 --- modules/FindLibXml2.cmake | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 04a73857..fd1a6319 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -53,15 +53,12 @@ IF( NOT LIBXML2_XMLLINT_EXECUTABLE ) MESSAGE(STATUS "xmllint program not found. Install it if you want validate generated doc file.") ENDIF(NOT LIBXML2_XMLLINT_EXECUTABLE ) -IF (LIBXML2_FOUND) - IF (NOT LibXml2_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - ENDIF (NOT LibXml2_FIND_QUIETLY) -ELSE (LIBXML2_FOUND) - IF (LibXml2_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could NOT find LibXml2") - ENDIF (LibXml2_FIND_REQUIRED) -ENDIF (LIBXML2_FOUND) + +INCLUDE(FindPackageHandleStandardArgs) + +# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if +# all listed variables are TRUE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR) MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE) -- cgit v1.2.1 From 9873dd51efce5302db772b87300159d484a8cca5 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 22 Dec 2008 07:54:41 +0000 Subject: this is not necessary anymore when using find_package_handle_standard_args() Alex svn path=/trunk/KDE/kdelibs/; revision=900080 --- modules/FindLibXml2.cmake | 6 ------ 1 file changed, 6 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index fd1a6319..bb3b860d 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -39,12 +39,6 @@ FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 ${PC_LIBXML_LIBRARY_DIRS} ) -IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND TRUE) -ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND FALSE) -ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint) # for backwards compat. with KDE 4.0.x: SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}") -- cgit v1.2.1 From 2bf8819d6bc23ab9b3bedb14a2ab7d1866d2e85e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 22 Dec 2008 07:58:59 +0000 Subject: -use uppercase consistently in this file Alex svn path=/trunk/KDE/kdelibs/; revision=900082 --- modules/FindLibXml2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index bb3b860d..453c261b 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -21,8 +21,8 @@ ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_LIBXML libxml-2.0) + FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PC_LIBXML libxml-2.0) SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) ENDIF (NOT WIN32) -- cgit v1.2.1 From ac954219018fac1c1cae99b6e69be9438e452233 Mon Sep 17 00:00:00 2001 From: David Jarvie Date: Wed, 11 Mar 2009 22:39:22 +0000 Subject: Suppress 'not found' messages from pkgconfig when the module subsequently attempts to locate the package by other means. svn path=/trunk/KDE/kdelibs/; revision=938476 --- modules/FindLibXml2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindLibXml2.cmake') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 453c261b..83858047 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -22,7 +22,7 @@ IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_LIBXML libxml-2.0) + PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0) SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) ENDIF (NOT WIN32) -- cgit v1.2.1