[Cmake-commits] [cmake-commits] alex committed UsePkgConfig.cmake 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv20144

Modified Files:
	UsePkgConfig.cmake 
Log Message:
STYLE: /usr/local/bin is in the path anyway
STYLE: this file is mostly uppercase commands, so make all commands
uppercase
ENH: add a status message in case pkgconfig didn't find the package (sync
with the one from KDE)

Alex


Index: UsePkgConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UsePkgConfig.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** UsePkgConfig.cmake	7 Mar 2007 20:36:09 -0000	1.6
--- UsePkgConfig.cmake	16 Aug 2008 11:01:49 -0000	1.7
***************
*** 13,20 ****
  
  
! FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
  
  MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
!   message(STATUS
      "WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig")
  # reset the variables at the beginning
--- 13,20 ----
  
  
! FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
  
  MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
!   MESSAGE(STATUS
      "WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig")
  # reset the variables at the beginning
***************
*** 34,51 ****
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir 
          OUTPUT_VARIABLE ${_include_DIR} )
!       string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
      
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir 
          OUTPUT_VARIABLE ${_link_DIR} )
!       string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs 
          OUTPUT_VARIABLE ${_link_FLAGS} )
!       string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags 
          OUTPUT_VARIABLE ${_cflags} )
!       string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
  
      ENDIF(NOT _return_VALUE)
--- 34,55 ----
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir 
          OUTPUT_VARIABLE ${_include_DIR} )
!       STRING(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
      
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir 
          OUTPUT_VARIABLE ${_link_DIR} )
!       STRING(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs 
          OUTPUT_VARIABLE ${_link_FLAGS} )
!       STRING(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
  
        EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags 
          OUTPUT_VARIABLE ${_cflags} )
!       STRING(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
! 
!     ELSE( NOT _return_VALUE)
! 
!       MESSAGE(STATUS "PKGCONFIG() indicates that ${_package} is not installed (install the package which contains ${_package}.pc if you want to support this feature)")
  
      ENDIF(NOT _return_VALUE)