summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'different-python-header-libs-exe-0013794'Brad King2014-03-061-1/+0
|\ | | | | | | | | bf28ff1f FindPythonLibs: Do not try to find the interpreter (#13794)
| * FindPythonLibs: Do not try to find the interpreter (#13794)Brad King2014-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'link-libraries-response-files'Brad King2014-03-061-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Windows: Use response files to specify link libraries for GNU toolsBrad King2014-03-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge topic 'watcom-rtdll-version'Brad King2014-03-051-10/+14
|\ \ \ | | | | | | | | | | | | | | | | b052902c Remove hard-coded version of RTDLL for Open Watcom
| * | | Remove hard-coded version of RTDLL for Open WatcomJiri Malak2014-03-041-10/+14
| |/ / | | | | | | | | | | | | | | | 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.
* | | FeatureSummary: Allow to combine and reorder values for the "WHAT" optionDaniele E. Domenichelli2014-03-031-17/+39
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'wix-additions'Brad King2014-03-032-1/+18
|\ \ | | | | | | | | | | | | | | | 642fa25d CPackWIX: support installation of empty directories 378eb5b7 CPackWIX: Allow Windows Installer property customization
| * | CPackWIX: Allow Windows Installer property customizationNils Gladitz2014-03-012-1/+18
| | |
* | | Merge topic 'FindRuby-2'Brad King2014-03-031-4/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | 57abfeaa Help: Add FindRuby-2 topic release notes 165f6430 FindRuby: Add support for Ruby 2.0 and 2.1
| * | | FindRuby: Add support for Ruby 2.0 and 2.1Bas Couwenberg2014-02-281-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | The most significant change since Ruby 1.9 is the changed path of config.h, from RbConfig::CONFIG['rubyhdrdir'] to RbConfig::CONFIG['rubyarchhdrdir'].
* | | | Merge topic 'watcom-wlib-quoting'Brad King2014-03-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5c5be193 Watcom: Fix static library name quoting for wlib
| * | | | Watcom: Fix static library name quoting for wlibJiri Malak2014-02-281-2/+2
| | |/ / | |/| | | | | | | | | | | | | | Use double-quotes instead of single-quotes around the static library target name in 'wlib' invocations.
* | | | Merge topic 'watcom-dll-no-symbols'Brad King2014-03-031-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 00503d38 Watcom: Fix creation of DLLs without any exported symbols
| * | | | Watcom: Fix creation of DLLs without any exported symbolsBrad King2014-02-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge topic 'different-python-header-libs-exe-0013794'Brad King2014-03-031-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | 3816cd2d FindPythonLibs: Find consistent Python interp, headers, libs (#13794)
| * | | FindPythonLibs: Find consistent Python interp, headers, libs (#13794)Matt McCormick2014-03-031-4/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge topic 'FindPkgConfig-PKG_CONFIG'Brad King2014-02-281-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | 80aa18b4 Help: Add release notes for topic 'FindPkgConfig-PKG_CONFIG' c53b5cd2 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)
| * | | FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)Christoph Grüninger2014-02-271-2/+12
| | | | | | | | | | | | | | | | | | | | If the environment variable PKG_CONFIG is set, use this as the default pkg-config executable.
* | | | Merge topic 'FindGTest-AUTO-SOURCES'Brad King2014-02-281-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ac42bca8 Help: Add FindGTest-AUTO-SOURCES topic release notes c50325b8 FindGTest: Optionally detect sources automatically (#14775)
| * | | | FindGTest: Optionally detect sources automatically (#14775)Nikolay Orliuk2014-02-271-2/+6
| | |/ / | |/| | | | | | | | | | | | | | Teach GTEST_ADD_TESTS an "AUTO" option to read the source files from the SOURCES target property of an executable.
* | | | Merge topic 'qt4-overlink'Brad King2014-02-281-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake.
| * | | | FindQt4: prevent overlinking when using UseQt4.cmake.Clinton Stimpson2014-02-261-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'add-FindOpenCL'Brad King2014-02-281-0/+134
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | 1b08e609 Help: Add release notes for topic 'add-FindOpenCL' 041485bc Add FindOpenCL module
| * | | Add FindOpenCL moduleMatthäus G. Chajdas2014-02-261-0/+134
| |/ /
* | | Merge topic 'fix-find_dependency-macro'Brad King2014-02-261-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | 3d8f7102 find_dependency: unset cmake_fd_version variable at end of macro 85d0f8de find_dependency: use correct version variable name
| * | | find_dependency: unset cmake_fd_version variable at end of macroAlex Merry2014-02-261-0/+1
| | | | | | | | | | | | | | | | This matches the other macro variables.
| * | | find_dependency: use correct version variable nameAlex Merry2014-02-261-1/+1
| | | | | | | | | | | | | | | | The code set cmake_fd_version, but used ${version}.
* | | | Merge topic 'msvc-compiler-pdb-files'Brad King2014-02-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fba51b09 MSVC: Add properties to configure compiler PDB files (#14762) 3737860a cmTarget: Add per-config compilation info 718a9532 cmTarget: Refactor ComputePDBOutputDir interface aae5184c Help: Refactor PDB_NAME and PDB_OUTPUT_DIRECTORY docs b4aac0ca Makefile: Fix per-config linker PDB output directory
| * | | | MSVC: Add properties to configure compiler PDB files (#14762)Brad King2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~437^2~2 (VS: Separate compiler and linker PDB files 2013-04-05) we no longer set /Fd with the PDB_NAME or PDB_OUTPUT_DIRECTORY properties. Those properties now exclusively handle linker PDB files. Since STATIC libraries do not link their compiler PDB file becomes more important. Add new target properties "COMPILE_PDB_NAME[_<CONFIG>]" and "COMPILE_PDB_OUTPUT_DIRECTORY[_<CONFIG>]" to specify the compiler PDB file location and pass the value to the MSVC /Fd option.
* | | | | Merge topic 'UseSWIG-avoid-extra-rebuilds'Brad King2014-02-261-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f0111deb UseSWIG: Name extra generated files after module name (#10080)
| * | | | | UseSWIG: Name extra generated files after module name (#10080)Julien Schueller2014-02-241-3/+4
| | |_|/ / | |/| | |
* | | | | Merge topic 'FindHg-add-WC_INFO'Brad King2014-02-251-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcefbe73 FindHg: Add Hg_WC_INFO macro 8993df6c FindHg: Search for TortoiseHg
| * | | | | FindHg: Add Hg_WC_INFO macroMatthäus G. Chajdas2014-02-251-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a macro to extract information from a Hg work tree much like the Subversion_WC_INFO macro does for Subversion work tree.
| * | | | | FindHg: Search for TortoiseHgMatthäus G. Chajdas2014-02-251-0/+2
| |/ / / / | | | | | | | | | | | | | | | Use the TortoiseHg registry entry as a search path.
* | | | | Merge topic 'fix-find_dependency-macro'Brad King2014-02-251-13/+20
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | 2be6dbe4 find_dependency: Ensure that ARGV1 has valid local content a35ce723 find_dependency: Add namespacing for variables in the macro.
| * | | find_dependency: Ensure that ARGV1 has valid local contentStephen Kelly2014-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | The ARGV1 value could come from a wrapping context if find_dependency is called from a function.
| * | | find_dependency: Add namespacing for variables in the macro.Stephen Kelly2014-02-241-13/+17
| | | | | | | | | | | | | | | | Avoid setting a variable called 'version' etc.
* | | | Merge topic 'ExternalProject-BUILD_ALWAYS'Brad King2014-02-241-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 73e5c6ae ExternalProject: Add option to always run the build step
| * | | ExternalProject: Add option to always run the build stepBrad King2014-02-211-0/+9
| |/ / | | | | | | | | | | | | | | | | | | Teach ExternalProject_Add a new BUILD_ALWAYS option to skip using the build step stamp file and execute the step on every build. Extend the BuildDepends test with a case to cover this option.
* | | Always set version variable of find_dependency macroAlex Merry2014-02-231-3/+1
|/ / | | | | | | | | | | | | | | | | | | | | If there is no ARGV1, that is fine; version will be made empty, and no version will be passed to find_package(). This is relevant when find_dependency is invoked multiple times, sometimes with a version specified and sometimes without. find_dependency(dep1 3.4) find_dependency(dep2) # version still set to 3.4.
* | CMake 3.0.0-rc1 version updateBrad King2014-02-191-1/+1
|/
* Merge topic 'FindOpenSSL-prefer-root'Brad King2014-02-191-5/+5
|\ | | | | | | | | e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
| * FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)Ho Cheung2014-02-181-5/+5
| | | | | | | | | | Use hints computed from this explicit variable before those computed by PkgConfig. They are more specific.
* | Merge topic 'FindJNI-ppc64le'Brad King2014-02-191-0/+2
|\ \ | | | | | | | | | | | | ac2527e1 FindJNI: Add ppc64le architecture
| * | FindJNI: Add ppc64le architectureDinar Valeev2014-02-181-0/+2
| |/ | | | | | | Signed-off-by: Dinar Valeev <dvaleev@suse.com>
* | FindBoost: Add suport for custom namespacesChuck Atkins2014-02-171-25/+37
|/ | | | | | | | | | When building boost with an alternate namespace the libraries generated will have a different naming convention. This is often done to ensure no symbol conflicts with external libraries built against a different version of boost. If the namespace used is "myprivateboost::" instead of "boost::" then the libraries built will be named myprivateboost_foo instead of boost_foo. Add an option to specify a custom namespace used to alter the library names that get searched for.
* Merge topic 'isystemForIcpc'Brad King2014-02-172-0/+2
|\ | | | | | | | | cab5ebd4 Intel compiler: add -isystem flag under Linux
| * Intel compiler: add -isystem flag under LinuxAlex Neundorf2014-02-062-0/+2
| | | | | | | | | | | | | | This makes the SYSTEM keyword work with the Intel compiler under Linux. AFAIK this is supported neither under Windows nor OSX. Alex
* | Merge topic 'osx-intel-info-split'Brad King2014-02-126-134/+36
|\ \ | | | | | | | | | | | | 3693c63f OS X: Split Intel compiler information files