Commit Graph

4821 Commits

Author SHA1 Message Date
Brad King
7122f6b1a8 Merge topic 'FindPkgConfig-revise-docs'
49ef91d7 FindPkgConfig: restructure documentation and document commands and variables
2014-03-12 10:13:17 -04:00
Brad King
5082e31ba3 Merge topic 'fix-find_dependency-EXACT'
224f50f4 find_dependency: Make sure invalid EXACT use can be reported.
2014-03-12 10:13:13 -04:00
Brad King
2c6970a3ca Merge topic 'fix-xcode-compiler-force'
8c9bfac3 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible
6852fb80 CMakeDetermine*Compiler: Factor out search for compiler in PATH
2014-03-12 10:13:12 -04:00
Stephen Kelly
224f50f42f find_dependency: Make sure invalid EXACT use can be reported.
Test the first argument directly for matching 'EXACT'. The error
check in its previous position was incorrect and would only trigger
with a version of '0' or similar.
2014-03-11 14:51:06 +01:00
Brad King
70c6eda8c2 Merge topic 'FindFreetype-path-suffix-without-include'
b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
2014-03-11 09:14:01 -04:00
Brad King
3d3adc0c57 Merge topic 'FindSDL-consistent-path-suffixes'
d71db3a0 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
2014-03-11 09:14:00 -04:00
Brad King
dfcacecd18 Merge topic 'fix-find_dependency-EXACT'
08ba128f find_dependency: Don't propagate EXACT argument.
2014-03-11 09:13:54 -04:00
Brad King
a2d63a9d04 Merge topic 'fix-Qt4-DBus-macro'
fc2bad57 Qt4: Use correct qdbus executable in macro.
2014-03-11 09:13:53 -04:00
Brad King
8c9bfac384 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible
During cross-compiling the toolchain file may use CMakeForceCompiler to
force a compiler setting.  When using the Xcode generator try to convert
it to a full path by searching the PATH as is done for the Makefile
generators.
2014-03-10 17:12:00 -04:00
Brad King
6852fb8034 CMakeDetermine*Compiler: Factor out search for compiler in PATH
Factor out a _cmake_find_compiler_path helper macro to avoid duplication
of the search for a full path to the compiler.
2014-03-10 17:12:00 -04:00
Daniele E. Domenichelli
49ef91d7a6 FindPkgConfig: restructure documentation and document commands and variables 2014-03-10 18:27:46 +01:00
Adrien Destugues
b79a1f6719 FindFreetype: Add plain 'freetype2' path suffix
On Haiku, the headers are not in an 'include' directory.
2014-03-10 09:42:05 -04:00
Brad King
d71db3a0d8 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
Add the 'SDL' path suffix to the FindSDL_*.cmake modules.  Add a comment
explaining the purpose of suffixes as in commit v3.0.0-rc1~540^2
(FindSDL: Add path suffixes for <prefix>/include/..., 2013-10-08).

Inspired-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
2014-03-10 09:40:34 -04:00
Brad King
29ff93a970 Merge branch 'fix-find_dependency-EXACT' into release 2014-03-10 09:38:48 -04:00
Brad King
ef0386c250 Merge branch 'fix-Qt4-DBus-macro' into release 2014-03-10 09:38:38 -04:00
Brad King
9d4394ee87 Merge branch 'python-3.4' into release 2014-03-10 09:36:31 -04:00
Stephen Kelly
fc2bad57ff Qt4: Use correct qdbus executable in macro.
Commit v3.0.0-rc1~71^2~9 (Qt4: Use IMPORTED executable names with
custom commands., 2014-01-24) erroneusly changed this command to
use the wrong target.
2014-03-10 11:50:28 +01:00
Brad King
ad9f0d831e Merge topic 'dev/string-apis'
b633b263 CPackWiX: Fix test to build with expected config
191f25e2 stringapi: Prevent a NULL dereference in WiX
219d6ad6 speedup: Avoid excess iterator dereferences
caaad357 speedup: Cache strings for comparisons
7abf4e31 stringapi: Use strings for dependency information
94fc63e2 stringapi: Use strings for cache iterator values
85fc9f26 stringapi: Command names
6557382d stringapi: Use strings for program paths
1a1b737c stringapi: Use strings for generator names
24b5e93d stringapi: Use strings for directories
11ed3e2c stringapi: Add string overload for the Def struct
b3bf31a5 stringapi: Miscellaneous char* parameters
5af95c39 typo: Match argument name with the header
2b17626e stringapi: Pass strings as install directories in CPack
3def29da stringapi: Use strings for feature arguments
acb116e3 stringapi: Return a string reference for the configuration
...
2014-03-09 10:29:02 -04:00
Ben Boeckel
a599611116 FindCUDA: Fix a typo 2014-03-08 13:05:31 -05:00
Brad King
83722f34f7 Merge topic 'python-3.4'
ab6201ab FindPython{Interp,Libs}: Search for Python 3.4.
2014-03-07 11:06:35 -05:00
Matt McCormick
ab6201ab64 FindPython{Interp,Libs}: Search for Python 3.4.
Python 3.4.0rnc1 was released on 2014-02-20.
2014-03-06 11:37:59 -05:00
Brad King
2977330a7b Merge topic 'different-python-header-libs-exe-0013794'
bf28ff1f FindPythonLibs: Do not try to find the interpreter (#13794)
2014-03-06 11:32:58 -05:00
Brad King
7c9041bdab Merge topic 'link-libraries-response-files'
489b1c23 Windows: Use response files to specify link libraries for GNU tools
745caae6 Makefile: Rename linker response file boolean to be more specific
5e8e4d0f cmLocalGenerator: Add response file option to OutputLinkLibraries
b9aa5041 cmLocalGenerator: Simplify GetIncludeFlags output formatting
971653b7 cmLocalGenerator: Add format option to ConvertToLinkReference
0c0ef9e7 cmLocalGenerator: Add format option to ConvertToIncludeReference
02bebd60 cmLocalGenerator: Add format option to ConvertToOutputForExisting
c8751709 Makefile: Factor out some duplicate link libraries generation
2014-03-06 09:46:50 -05:00
Stephen Kelly
08ba128f51 find_dependency: Don't propagate EXACT argument.
If a package is requested with an EXACT version, that doesn't imply
that dependencies must be found EXACTly too.

Extend the macro to allow specifying that a dependency must be found
by EXACT version instead.
2014-03-06 15:07:37 +01:00
Brad King
489b1c23b9 Windows: Use response files to specify link libraries for GNU tools
Work around the command-line-length limit by using an @linklibs.rsp
response file to pass the flags for link libraries.  This allows
very long lists of libraries to be used in addition to the existing
support for passing object files via response file.

Suggested-by: Peter Keuschnigg <peter.keuschnigg@pmu.ac.at>
2014-03-05 13:07:41 -05:00
Brad King
bf28ff1f42 FindPythonLibs: Do not try to find the interpreter (#13794)
The parent commit taught FindPythonLibs to try to find PythonInterp
unconditionally.  Some projects may want the libraries of a specific
version even when the corresponding interpreter is not available.  Drop
the internal use of FindPythonInterp and just use the versions from it
if it happens to have been found by the project first.  That will allow
projects to get a consistent version when they want both but not
otherwise force them to find the interpreter.
2014-03-05 11:58:13 -05:00
Brad King
c03f42ef32 Merge topic 'watcom-rtdll-version'
b052902c Remove hard-coded version of RTDLL for Open Watcom
2014-03-05 11:08:05 -05:00
Jiri Malak
b052902c32 Remove hard-coded version of RTDLL for Open Watcom
In InstallRequiredSystemLibraries the version number for RTDLL can be
calculated from the compiler version.  This will support current and
future OW versions without updating the module again.
2014-03-04 16:28:53 -05:00
Daniele E. Domenichelli
d348cd1bc5 FeatureSummary: Allow to combine and reorder values for the "WHAT" option
For example it is now possible to do:

  feature_summary(WHAT ENABLED_FEATURES
                       DISABLED_FEATURES)

That produces an output like:

  --
  -- The following features have been enabled:

   * Feature1
   * Feature2

  -- The following features have been disabled:
   * Feature2

Skipping the lists that are empty.

Without this patch this would require to do:

  message(STATUS "")
  feature_summary(WHAT ENABLED_FEATURES
      DESCRIPTION "The following features have been enabled:")
  feature_summary(WHAT DISABLED_FEATURES
      DESCRIPTION "The following features have been disabled:")

And empty lists would not be skipped.

The behaviour when WHAT has a single argument (ALL or any option) is
unchanged.
2014-03-03 19:52:13 +01:00
Brad King
909c0533d0 Merge topic 'wix-additions'
642fa25d CPackWIX: support installation of empty directories
378eb5b7 CPackWIX: Allow Windows Installer property customization
2014-03-03 10:06:25 -05:00
Brad King
d57bc8797d Merge topic 'FindRuby-2'
57abfeaa Help: Add FindRuby-2 topic release notes
165f6430 FindRuby: Add support for Ruby 2.0 and 2.1
2014-03-03 10:06:24 -05:00
Brad King
ae215492cf Merge topic 'watcom-wlib-quoting'
5c5be193 Watcom: Fix static library name quoting for wlib
2014-03-03 10:06:21 -05:00
Brad King
21c3a71eb6 Merge topic 'watcom-dll-no-symbols'
00503d38 Watcom: Fix creation of DLLs without any exported symbols
2014-03-03 10:06:20 -05:00
Brad King
c32ac3331f Merge topic 'different-python-header-libs-exe-0013794'
3816cd2d FindPythonLibs: Find consistent Python interp, headers, libs (#13794)
2014-03-03 10:06:19 -05:00
Matt McCormick
3816cd2dc7 FindPythonLibs: Find consistent Python interp, headers, libs (#13794)
When possible, get consistent version of the Python interpreter, headers path,
and library.

Now find_package(PythonLibs) internally calls find_package(PythonInterp
QUIET) and uses the resulting PYTHON_VERSION_MAJOR and
PYTHON_VERSION_MINOR to prefer these versions when looking for the
header path and library.  The Python_ADDITIONAL_VERSIONS variable has
priority over the interpreter version.

Co-Author: Adam Wolf
Co-Author: Gert Wollny <gw.fossdev@gmail.com>
2014-03-03 10:02:35 -05:00
Nils Gladitz
378eb5b712 CPackWIX: Allow Windows Installer property customization 2014-03-01 23:13:35 +01:00
Jiri Malak
5c5be193cf Watcom: Fix static library name quoting for wlib
Use double-quotes instead of single-quotes around the static library
target name in 'wlib' invocations.
2014-02-28 13:34:59 -05:00
Brad King
eafd2a8511 Merge topic 'FindPkgConfig-PKG_CONFIG'
80aa18b4 Help: Add release notes for topic 'FindPkgConfig-PKG_CONFIG'
c53b5cd2 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)
2014-02-28 09:48:38 -05:00
Brad King
e62102bef1 Merge topic 'FindGTest-AUTO-SOURCES'
ac42bca8 Help: Add FindGTest-AUTO-SOURCES topic release notes
c50325b8 FindGTest: Optionally detect sources automatically (#14775)
2014-02-28 09:48:36 -05:00
Brad King
18646dd397 Merge topic 'qt4-overlink'
b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake.
2014-02-28 09:48:34 -05:00
Brad King
27defbd6d4 Merge topic 'add-FindOpenCL'
1b08e609 Help: Add release notes for topic 'add-FindOpenCL'
041485bc Add FindOpenCL module
2014-02-28 09:48:30 -05:00
Brad King
42f981987e Merge branch 'FindRuby-2' into release 2014-02-28 08:50:32 -05:00
Bas Couwenberg
165f6430d9 FindRuby: Add support for Ruby 2.0 and 2.1
The most significant change since Ruby 1.9 is the changed path of
config.h, from RbConfig::CONFIG['rubyhdrdir'] to
RbConfig::CONFIG['rubyarchhdrdir'].
2014-02-28 08:41:33 -05:00
Brad King
00503d387e Watcom: Fix creation of DLLs without any exported symbols
Create each DLL import library by passing "option implib=..." to the
linker for its SHARED library.  This works even when there are no
symbols to be exported.  Leave the option out for MODULE libraries
because we do not need an import library for them.  For executables,
retain the separate invocation of wlib because we want an import
library only when the ENABLE_EXPORTS property is set, and in that
case the project should provide symbols.

Suggested-by: J Decker <d3ck0r@gmail.com>
2014-02-27 16:22:28 -05:00
Christoph Grüninger
c53b5cd221 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)
If the environment variable PKG_CONFIG is set, use this as the
default pkg-config executable.
2014-02-27 10:29:01 -05:00
Nikolay Orliuk
c50325b8e5 FindGTest: Optionally detect sources automatically (#14775)
Teach GTEST_ADD_TESTS an "AUTO" option to read the source files from the
SOURCES target property of an executable.
2014-02-27 08:52:18 -05:00
Clinton Stimpson
b94ecab6d6 FindQt4: prevent overlinking when using UseQt4.cmake.
Now it only links with the Qt libraries specified by the user,
instead of automatically including all dependencies.
Fixes #14750 and thanks to Orion Poplawski.
2014-02-26 10:55:38 -07:00
Brad King
6391b32a32 Merge topic 'fix-find_dependency-macro'
3d8f7102 find_dependency: unset cmake_fd_version variable at end of macro
85d0f8de find_dependency: use correct version variable name
2014-02-26 10:31:45 -05:00
Alex Merry
3d8f7102bb find_dependency: unset cmake_fd_version variable at end of macro
This matches the other macro variables.
2014-02-26 10:27:01 -05:00
Alex Merry
85d0f8de7e find_dependency: use correct version variable name
The code set cmake_fd_version, but used ${version}.
2014-02-26 10:27:01 -05:00