cmake 2.8.8 fix and openSUSE 12.2

[jan_kardell]

Hi,

I'm trying to build svn 8269. CMake 2.8.8 on openSUSE 12.2 doesn't have the pkg-config bug, i suppose SUSE have patched it. So the workaround for that bug breaks the build. I suggest the following change:

Code Select Expand


index f58c1a5..95b7d4a 100644
--- a/cmake/admCheckRequiredLibs.cmake
+++ b/cmake/admCheckRequiredLibs.cmake
@@ -11,7 +11,9 @@ FIND_PACKAGE(PkgConfig)

if (${CMAKE_VERSION} VERSION_EQUAL 2.8.8)
        # workaround for bug in CMake 2.8.8 (http://www.cmake.org/Bug/view.php?id=13125)
-       set(PKG_CONFIG_FOUND ${PKGCONFIG_FOUND})
+       if (DEFINED PKGCONFIG_FOUND)
+               set(PKG_CONFIG_FOUND ${PKGCONFIG_FOUND})
+       endif (DEFINED PKGCONFIG_FOUND)
endif (${CMAKE_VERSION} VERSION_EQUAL 2.8.8)

IF (NOT PKG_CONFIG_FOUND)


//Jan