Prefix internal variables by an underscore to prevent naming clash on…

… Gentoo.

Fix #25.

pkg-config.cmake

@@ -28,55 +28,55 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES bindir pkglibdir datarootdir pkgdatarootdir
 #
 MACRO(_SETUP_PROJECT_PKG_CONFIG)
   # Pkg-config related commands.
-  SET(PKG_CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
-  SET(PKG_CONFIG_EXEC_PREFIX "${PKG_CONFIG_PREFIX}")
-  SET(PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-  SET(PKG_CONFIG_BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
-  SET(PKG_CONFIG_PKGLIBDIR "${CMAKE_INSTALL_FULL_PKGLIBDIR}")
-  SET(PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-  SET(PKG_CONFIG_DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
-  SET(PKG_CONFIG_PKGDATAROOTDIR "${CMAKE_INSTALL_FULL_DATADIR}")
-  SET(PKG_CONFIG_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
-  SET(PKG_CONFIG_DOXYGENDOCDIR "${PKG_CONFIG_DOCDIR}/doxygen-html")
-
-  SET(PKG_CONFIG_PROJECT_NAME "${PROJECT_NAME}")
-  SET(PKG_CONFIG_DESCRIPTION "${PROJECT_DESCRIPTION}")
-  SET(PKG_CONFIG_URL "${PROJECT_URL}")
-  SET(PKG_CONFIG_VERSION "${PROJECT_VERSION}")
-  SET(PKG_CONFIG_REQUIRES "")
-  SET(PKG_CONFIG_CONFLICTS "")
-  SET(PKG_CONFIG_LIBS "${LIBDIR_KW}\${libdir}")
-  SET(PKG_CONFIG_LIBS_PRIVATE "")
-  SET(PKG_CONFIG_CFLAGS "-I\${includedir}")
+  SET(_PKG_CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
+  SET(_PKG_CONFIG_EXEC_PREFIX "${_PKG_CONFIG_PREFIX}")
+  SET(_PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+  SET(_PKG_CONFIG_BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
+  SET(_PKG_CONFIG_PKGLIBDIR "${CMAKE_INSTALL_FULL_PKGLIBDIR}")
+  SET(_PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+  SET(_PKG_CONFIG_DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
+  SET(_PKG_CONFIG_PKGDATAROOTDIR "${CMAKE_INSTALL_FULL_DATADIR}")
+  SET(_PKG_CONFIG_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
+  SET(_PKG_CONFIG_DOXYGENDOCDIR "${_PKG_CONFIG_DOCDIR}/doxygen-html")
+
+  SET(_PKG_CONFIG_PROJECT_NAME "${PROJECT_NAME}")
+  SET(_PKG_CONFIG_DESCRIPTION "${PROJECT_DESCRIPTION}")
+  SET(_PKG_CONFIG_URL "${PROJECT_URL}")
+  SET(_PKG_CONFIG_VERSION "${PROJECT_VERSION}")
+  SET(_PKG_CONFIG_REQUIRES "")
+  SET(_PKG_CONFIG_CONFLICTS "")
+  SET(_PKG_CONFIG_LIBS "${LIBDIR_KW}\${libdir}")
+  SET(_PKG_CONFIG_LIBS_PRIVATE "")
+  SET(_PKG_CONFIG_CFLAGS "-I\${includedir}")
 
   SET(PKG_CONFIG_EXTRA "")
 
   # Where to install the pkg-config file?
-  SET(PKG_CONFIG_DIR "${PKG_CONFIG_LIBDIR}/pkgconfig")
+  SET(_PKG_CONFIG_DIR "${_PKG_CONFIG_LIBDIR}/pkgconfig")
 
   # Watch variables.
   LIST(APPEND LOGGING_WATCHED_VARIABLES
-    PKG_CONFIG_FOUND
-    PKG_CONFIG_EXECUTABLE
-    PKG_CONFIG_PREFIX
-    PKG_CONFIG_EXEC_PREFIX
-    PKG_CONFIG_LIBDIR
-    PKG_CONFIG_BINDIR
-    PKG_CONFIG_PKGLIBDIR
-    PKG_CONFIG_INCLUDEDIR
-    PKG_CONFIG_DATAROOTDIR
-    PKG_CONFIG_PKGDATAROOTDIR
-    PKG_CONFIG_DOCDIR
-    PKG_CONFIG_DOXYGENDOCDIR
-    PKG_CONFIG_PROJECT_NAME
-    PKG_CONFIG_DESCRIPTION
-    PKG_CONFIG_URL
-    PKG_CONFIG_VERSION
-    PKG_CONFIG_REQUIRES
-    PKG_CONFIG_CONFLICTS
-    PKG_CONFIG_LIBS
-    PKG_CONFIG_LIBS_PRIVATE
-    PKG_CONFIG_CFLAGS
+    _PKG_CONFIG_FOUND
+    _PKG_CONFIG_EXECUTABLE
+    _PKG_CONFIG_PREFIX
+    _PKG_CONFIG_EXEC_PREFIX
+    _PKG_CONFIG_LIBDIR
+    _PKG_CONFIG_BINDIR
+    _PKG_CONFIG_PKGLIBDIR
+    _PKG_CONFIG_INCLUDEDIR
+    _PKG_CONFIG_DATAROOTDIR
+    _PKG_CONFIG_PKGDATAROOTDIR
+    _PKG_CONFIG_DOCDIR
+    _PKG_CONFIG_DOXYGENDOCDIR
+    _PKG_CONFIG_PROJECT_NAME
+    _PKG_CONFIG_DESCRIPTION
+    _PKG_CONFIG_URL
+    _PKG_CONFIG_VERSION
+    _PKG_CONFIG_REQUIRES
+    _PKG_CONFIG_CONFLICTS
+    _PKG_CONFIG_LIBS
+    _PKG_CONFIG_LIBS_PRIVATE
+    _PKG_CONFIG_CFLAGS
     PKG_CONFIG_EXTRA
     )
 
@@ -173,11 +173,11 @@ MACRO(ADD_DEPENDENCY P_REQUIRED DOC_ONLY PKG_CONFIG_STRING)
     )
 
   # Get the values of additional variables.
-  FOREACH(VARIABLE ${PKG_CONFIG_ADDITIONAL_VARIABLES})
+  FOREACH(VARIABLE ${_PKG_CONFIG_ADDITIONAL_VARIABLES})
     # Upper-case version of the variable for CMake variable generation.
     STRING(TOUPPER "${VARIABLE}" "VARIABLE_UC")
     EXECUTE_PROCESS(
-      COMMAND "${PKG_CONFIG_EXECUTABLE}"
+      COMMAND "${_PKG_CONFIG_EXECUTABLE}"
       "--variable=${VARIABLE}" "${LIBRARY_NAME}"
       OUTPUT_VARIABLE "${PREFIX}_${VARIABLE_UC}"
       ERROR_QUIET)
@@ -194,7 +194,7 @@ MACRO(ADD_DEPENDENCY P_REQUIRED DOC_ONLY PKG_CONFIG_STRING)
   # Add the package to the dependency list if found and if dependency
   # is triggered not only for documentation
   IF((${${PREFIX}_FOUND}) AND (NOT ${DOC_ONLY}))
-    _ADD_TO_LIST(PKG_CONFIG_REQUIRES "${PKG_CONFIG_STRING}" ",")
+    _ADD_TO_LIST(_PKG_CONFIG_REQUIRES "${PKG_CONFIG_STRING}" ",")
   ENDIF()
 
   # Add the package to the cmake dependency list
@@ -263,7 +263,7 @@ ENDMACRO(ADD_DOC_DEPENDENCY)
 MACRO(PKG_CONFIG_APPEND_LIBRARY_DIR DIRS)
   FOREACH(DIR ${DIRS})
     IF(DIR)
-      SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBDIR_KW}${DIR}")
+      SET(_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} ${LIBDIR_KW}${DIR}")
     ENDIF(DIR)
   ENDFOREACH(DIR ${DIRS})
 ENDMACRO(PKG_CONFIG_APPEND_LIBRARY_DIR DIR)
@@ -277,7 +277,7 @@ ENDMACRO(PKG_CONFIG_APPEND_LIBRARY_DIR DIR)
 MACRO(PKG_CONFIG_APPEND_CFLAGS FLAGS)
   FOREACH(FLAG ${FLAGS})
     IF(FLAG)
-      SET(PKG_CONFIG_CFLAGS "${PKG_CONFIG_CFLAGS} ${FLAG}")
+      SET(_PKG_CONFIG_CFLAGS "${_PKG_CONFIG_CFLAGS} ${FLAG}")
     ENDIF(FLAG)
   ENDFOREACH(FLAG ${FLAGS})
 ENDMACRO(PKG_CONFIG_APPEND_CFLAGS)
@@ -303,13 +303,13 @@ MACRO(PKG_CONFIG_APPEND_LIBS_RAW LIBS)
       IF( APPLE AND ${LIB} MATCHES .framework)
 	    GET_FILENAME_COMPONENT(framework_PATH ${LIB} PATH)
 	    GET_FILENAME_COMPONENT(framework_NAME ${LIB} NAME_WE)
-        SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -F${framework_PATH} -framework ${framework_NAME}")
+        SET(_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -F${framework_PATH} -framework ${framework_NAME}")
       ELSE( APPLE AND ${LIB} MATCHES .framework)
-        SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIB}")
+        SET(_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} ${LIB}")
       ENDIF( APPLE AND ${LIB} MATCHES .framework)
     ENDIF(LIB)
   ENDFOREACH(LIB ${LIBS})
-  STRING(REPLACE "\n" "" PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS}")
+  STRING(REPLACE "\n" "" _PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS}")
 ENDMACRO(PKG_CONFIG_APPEND_LIBS_RAW)
 
 
@@ -324,7 +324,7 @@ ENDMACRO(PKG_CONFIG_APPEND_LIBS_RAW)
 MACRO(PKG_CONFIG_APPEND_LIBS LIBS)
   FOREACH(LIB ${LIBS})
     IF(LIB)
-      SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBINCL_KW}${LIB}${LIB_EXT}")
+      SET(_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} ${LIBINCL_KW}${LIB}${LIB_EXT}")
     ENDIF(LIB)
   ENDFOREACH(LIB ${LIBS})
 ENDMACRO(PKG_CONFIG_APPEND_LIBS)

pkg-config.pc.cmake

@@ -1,22 +1,22 @@
-prefix=${PKG_CONFIG_PREFIX}
-exec_prefix=${PKG_CONFIG_EXEC_PREFIX}
-libdir=${PKG_CONFIG_LIBDIR}
-bindir=${PKG_CONFIG_BINDIR}
-pkglibdir=${PKG_CONFIG_PKGLIBDIR}
-includedir=${PKG_CONFIG_INCLUDEDIR}
-datarootdir=${PKG_CONFIG_DATAROOTDIR}
-pkgdatarootdir=${PKG_CONFIG_PKGDATAROOTDIR}
-docdir=${PKG_CONFIG_DOCDIR}
-doxygendocdir=${PKG_CONFIG_DOXYGENDOCDIR}
+prefix=${_PKG_CONFIG_PREFIX}
+exec_prefix=${_PKG_CONFIG_EXEC_PREFIX}
+libdir=${_PKG_CONFIG_LIBDIR}
+bindir=${_PKG_CONFIG_BINDIR}
+pkglibdir=${_PKG_CONFIG_PKGLIBDIR}
+includedir=${_PKG_CONFIG_INCLUDEDIR}
+datarootdir=${_PKG_CONFIG_DATAROOTDIR}
+pkgdatarootdir=${_PKG_CONFIG_PKGDATAROOTDIR}
+docdir=${_PKG_CONFIG_DOCDIR}
+doxygendocdir=${_PKG_CONFIG_DOXYGENDOCDIR}
 
-Name: ${PKG_CONFIG_PROJECT_NAME}
-Description: ${PKG_CONFIG_DESCRIPTION}
-URL: ${PKG_CONFIG_URL}
-Version: ${PKG_CONFIG_VERSION}
-Requires: ${PKG_CONFIG_REQUIRES}
-Conflicts: ${PKG_CONFIG_CONFLICTS}
-Libs: ${PKG_CONFIG_LIBS}
-Libs.private: ${PKG_CONFIG_LIBS_PRIVATE}
-Cflags: ${PKG_CONFIG_CFLAGS}
+Name: ${_PKG_CONFIG_PROJECT_NAME}
+Description: ${_PKG_CONFIG_DESCRIPTION}
+URL: ${_PKG_CONFIG_URL}
+Version: ${_PKG_CONFIG_VERSION}
+Requires: ${_PKG_CONFIG_REQUIRES}
+Conflicts: ${_PKG_CONFIG_CONFLICTS}
+Libs: ${_PKG_CONFIG_LIBS}
+Libs.private: ${_PKG_CONFIG_LIBS_PRIVATE}
+Cflags: ${_PKG_CONFIG_CFLAGS}
 
 ${PKG_CONFIG_EXTRA}