[fusion-commits] Extra plugins: Changes to 'master' (8ec08c35749f936444c5a1d44842df0b71b75a9f)

[guillaume at server.opencompositing.org]

New commits:
commit 8ec08c35749f936444c5a1d44842df0b71b75a9f
Author: Guillaume Seguin <guillaume at segu.in>
Date:   Thu May 29 13:07:16 2008 +0200

    CMake build system: modify PKG_CONFIG_PATH only when needed


 cmake/CompizFusion.cmake |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)


Modified: fusion/plugins-extra/cmake/CompizFusion.cmake
===================================================================
--- fusion/plugins-extra/cmake/CompizFusion.cmake
+++ fusion/plugins-extra/cmake/CompizFusion.cmake
@@ -75,13 +75,17 @@ endif (CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MI
 
 set (CMAKE_SKIP_RPATH On)
 
-# add install prefix to pkgconfig search path
-if ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
-    set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
-else ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
-    set (ENV{PKG_CONFIG_PATH}
-         "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-endif ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
+set (PKGCONFIG_REGEX ".*${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig.*")
+
+# add install prefix to pkgconfig search path if needed
+if (NOT "$ENV{PKG_CONFIG_PATH}" MATCHES "${PKGCONFIG_REGEX}")
+    if ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
+        set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+    else ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
+        set (ENV{PKG_CONFIG_PATH}
+             "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+    endif ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
+endif (NOT "$ENV{PKG_CONFIG_PATH}" MATCHES "${PKGCONFIG_REGEX}")
 
 include (FindPkgConfig)