1. 28 Oct, 2015 1 commit
    • Benjamin Chrétien's avatar
      FindPkgConfig: return actual error when a package is not found (#15810) · 1bfb527f
      Benjamin Chrétien authored
      In some cases, CMake returned the following error:
      
      -- Checking for module 'foo'
      --   Package 'foo' not found
      
      When the actual error returned by pkg-config was:
      
        Package 'bar', required by 'foo', not found
      
      Now, the actual error is forwarded to the user.
      
      -- Checking for module 'foo'
      --   Package 'bar', required by 'foo', not found
      
      For the standard case (i.e. the package was indeed not found), the
      CMake error was:
      
      -- Checking for module 'foo'
      --   Package 'foo' not found
      
      But it now prints:
      
      -- Checking for module 'foo'
      --   No package 'foo' found
      
      The associated test was also updated. ${last} refers to the last
      CLI argument.
      1bfb527f
  2. 21 Sep, 2015 1 commit
  3. 17 Sep, 2015 1 commit
  4. 18 Aug, 2015 1 commit
    • Rolf Eike Beer's avatar
      FindPkgConfig: remove variable dereference · b9ec9392
      Rolf Eike Beer authored
      If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
      cmake_minimum_required() call is present this line can lead to an error as that
      string is empty so too few arguments are passed to if():
      
      See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
      See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
      CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
        given arguments:
      
          "VERSION_LESS" "3.1"
      
        Unknown arguments specified
      Call Stack (most recent call first):
        /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
        /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
      b9ec9392
  5. 12 Aug, 2015 1 commit
  6. 29 May, 2015 1 commit
  7. 27 Feb, 2015 1 commit
  8. 06 Nov, 2014 1 commit
  9. 14 Apr, 2014 1 commit
  10. 24 Mar, 2014 1 commit
  11. 17 Mar, 2014 2 commits
    • Daniele E. Domenichelli's avatar
      FindPkgConfig: small refactoring · 453d2b24
      Daniele E. Domenichelli authored
      453d2b24
    • Daniele E. Domenichelli's avatar
      FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926) · 3df51470
      Daniele E. Domenichelli authored
      Use CMAKE_PREFIX_PATH, CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH
      cache and environment variables to extend PKG_CONFIG_PATH before calling
      pkg-config.
      
      In each of the path in these variables it searches for lib/pkgconfig.
      Then, depending on the system, it searches for
      lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig (debian) or for
      lib64/pkgconfig (other 64 bit unixes). If any of these path is found,
      it is appended to the PKG_CONFIG_PATH enviromnent variable.
      
      Add two new arguments to the pkg_check_module and pkg_search_module
      macro, NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH. The new signature
      are therefore:
      
         pkg_check_modules(<PREFIX> [REQUIRED] [QUIET]
                           [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH]
                           <MODULE> [<MODULE>]*)
         pkg_search_module(<PREFIX> [REQUIRED] [QUIET]
                           [NO_CMAKE_PATH] [NO_CMAKE_ENVIRONMENT_PATH]
                           <MODULE> [<MODULE>]*)
      
      By default, if CMAKE_MINIMUM_REQUIRED_VERSION is 3.1 or later (in
      order to keep compatibility with the previous behavior), or if
      PKG_CONFIG_USE_CMAKE_PREFIX_PATH is set, the CMAKE_PREFIX_PATH,
      CMAKE_FRAMEWORK_PATH, and CMAKE_APPBUNDLE_PATH cache and environment
      variables will be added to pkgconfig search path.
      
      The NO_CMAKE_PATH and NO_CMAKE_ENVIRONMENT_PATH arguments disable this
      behavior for the cache variables and the environment variables,
      respectively, similarly to the find_package() command.
      3df51470
  12. 10 Mar, 2014 1 commit
  13. 27 Feb, 2014 1 commit
  14. 15 Oct, 2013 1 commit
  15. 13 Aug, 2012 2 commits
    • Kitware Robot's avatar
      Remove CMake-language block-end command arguments · 9db31162
      Kitware Robot authored
      Ancient versions of CMake required else(), endif(), and similar block
      termination commands to have arguments matching the command starting the
      block.  This is no longer the preferred style.
      
      Run the following shell code:
      
      for c in else endif endforeach endfunction endmacro endwhile; do
          echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
      done >convert.sed &&
      git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
      egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
      egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
      xargs -0 sed -i -f convert.sed &&
      rm convert.sed
      9db31162
    • Kitware Robot's avatar
      Remove trailing whitespace from most CMake and C/C++ code · 7bbaa428
      Kitware Robot authored
      Our Git commit hooks disallow modification or addition of lines with
      trailing whitespace.  Wipe out all remnants of trailing whitespace
      everywhere except third-party code.
      
      Run the following shell code:
      
      git ls-files -z -- \
       bootstrap doxygen.config '*.readme' \
       '*.c' '*.cmake' '*.cpp' '*.cxx' \
       '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
       '*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
      egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
      egrep -z -v '^(Modules/CPack\..*\.in)' |
      xargs -0 sed -i 's/ \+$//'
      7bbaa428
  16. 15 Apr, 2012 1 commit
  17. 18 Feb, 2012 1 commit
  18. 20 Jan, 2012 1 commit
  19. 09 Aug, 2010 1 commit
  20. 08 May, 2010 1 commit
    • Alexander Neundorf's avatar
      -add QUIET keyword to pkgconfig macros · af3a288e
      Alexander Neundorf authored
      Synced from KDE svn: pkg_check_modules() and pkg_search_module() now
      both support a QUIET keyword. When given, no messages will be printed (except the REQUIRED ones)
      
      This also fixes #10469 (confusing output of FindLibXml2.cmake)
      
      Alex
      af3a288e
  21. 09 Oct, 2009 1 commit
  22. 05 Oct, 2009 1 commit
    • Brad King's avatar
      Remove old license from FindPkgConfig.cmake module · 94073399
      Brad King authored
      This module was contributed under a BSD-like license.  We added CMake's
      OSI-approved BSD License on top of it.  With the author's permission,
      this commit removes the old license text and puts the author's copyright
      notice in the block referring to the new license.
      94073399
  23. 01 Oct, 2009 1 commit
  24. 28 Sep, 2009 1 commit
    • Brad King's avatar
      Convert CMake find-modules to BSD License · c4bb9c9d
      Brad King authored
      This adds copyright/license notification blocks CMake's find-modules.
      Many of the modules had no notices at all.  Some had notices referring
      to the BSD license already.  This commit normalizes existing notices and
      adds missing notices.
      c4bb9c9d
  25. 07 Feb, 2008 1 commit
  26. 17 Dec, 2007 1 commit
  27. 14 Dec, 2007 1 commit
  28. 26 Aug, 2007 1 commit
  29. 09 Dec, 2006 1 commit
  30. 29 Nov, 2006 1 commit
  31. 22 Nov, 2006 1 commit