summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Watcom: Introduce OpenWatcom compiler id and fix compiler versionJiri Malak2014-03-174-23/+39
| | | | | | Distinguish "Open Watcom" from old "Watcom" by introducing a new "OpenWatcom" compiler id. The __WATCOMC__ format is "VVRP" for Watcom and "VVRP + 1100" for Open Watcom.
* Watcom: Detect compiler target architecture and platformJiri Malak2014-03-171-0/+28
| | | | | In CMakePlatformId.h.in, fill ARCHITECTURE_ID and PLATFORM_ID for Open Watcom.
* Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH'Brad King2014-03-171-8/+150
|\ | | | | | | | | 3df51470 FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)
| * FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)Daniele E. Domenichelli2014-03-171-8/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'intel-14-version'Brad King2014-03-172-2/+10
|\ \ | | | | | | | | | | | | eddabf9f CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)
| * | CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806)Brad King2014-03-142-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Intel release notes: http://software.intel.com/sites/default/files/l-compiler-release-update.pdf the __INTEL_COMPILER_UPDATE predefined macro was introduced to hold the third version component. Reported-by: Dirk Ribbrock <dirk.ribbrock@mathematik.uni-dortmund.de> Co-Author: Rolf Eike Beer <kde@opensource.sf-tec.de>
* | | Merge topic 'cpack-deb-compression-types'Brad King2014-03-141-1/+12
|\ \ \ | | | | | | | | | | | | | | | | 13778cd3 CPackDeb: Add option to set compression type
| * | | CPackDeb: Add option to set compression typeSean D'Epagnier2014-03-141-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add a CPACK_DEBIAN_COMPRESSION_TYPE option to set the compression type. Default to 'gzip' to preserve existing behavior. Use "cmake -E tar" for 'gzip', 'bzip2', and 'none'. Use system "tar" for 'lzma' and 'xz'.
* | | | Merge topic 'FeatureSummary_missing_titles'Brad King2014-03-141-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND
| * | | | FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUNDDaniele E. Domenichelli2014-03-141-0/+2
| |/ / / | | | | | | | | | | | | Since now these can be used with the WHAT argument a title is required.
* | | | Merge topic 'different-python-header-libs-exe-0013794'Brad King2014-03-142-9/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 59220198 FindPython*: Document suggested find_package order (#13794) a9e6de2a FindPythonInterp: Use consistent version with PythonLibs (#13794)
| * | | | FindPython*: Document suggested find_package order (#13794)Matt McCormick2014-03-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Document in both FindPythonInterp.cmake and FindPythonLibs.cmake that find_package(PythonInterp) should be called before find_package(PythonLibs).
| * | | | FindPythonInterp: Use consistent version with PythonLibs (#13794)Matt McCormick2014-03-141-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If find_package(PythonLibs) find_package(PythonInterp) is called, help PythonInterp to get a version of PYTHON_EXECUTABLE consistent with the library versions found by PythonLibs.
* | | | | Merge branch 'fix-find_dependency-empty-version'Brad King2014-03-131-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | find_dependency: Give more helpful message if VERSION is emptyAurélien Gâteau2014-03-131-2/+5
| | | | |
| * | | | Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-121-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-xcode-compiler-force' into releaseBrad King2014-03-115-92/+37
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindPkgConfig-revise-docs'Brad King2014-03-121-135/+118
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 49ef91d7 FindPkgConfig: restructure documentation and document commands and variables
| * | | | | | FindPkgConfig: restructure documentation and document commands and variablesDaniele E. Domenichelli2014-03-101-135/+118
| | | | | | |
* | | | | | | Merge topic 'fix-find_dependency-EXACT'Brad King2014-03-121-3/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 224f50f4 find_dependency: Make sure invalid EXACT use can be reported.
| * | | | | | find_dependency: Make sure invalid EXACT use can be reported.Stephen Kelly2014-03-111-3/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-101-2/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-Qt4-DBus-macro' into releaseBrad King2014-03-101-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'python-3.4' into releaseBrad King2014-03-102-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindRuby-2' into releaseBrad King2014-02-281-4/+20
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'fix-xcode-compiler-force'Brad King2014-03-125-92/+37
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c9bfac3 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible 6852fb80 CMakeDetermine*Compiler: Factor out search for compiler in PATH
| * | | | | | | | | Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possibleBrad King2014-03-103-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | CMakeDetermine*Compiler: Factor out search for compiler in PATHBrad King2014-03-105-92/+34
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a _cmake_find_compiler_path helper macro to avoid duplication of the search for a full path to the compiler.
* | | | | | | | | Merge topic 'FindFreetype-path-suffix-without-include'Brad King2014-03-111-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
| * | | | | | | | | FindFreetype: Add plain 'freetype2' path suffixAdrien Destugues2014-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Haiku, the headers are not in an 'include' directory.
* | | | | | | | | | Merge topic 'FindSDL-consistent-path-suffixes'Brad King2014-03-115-5/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d71db3a0 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
| * | | | | | | | | | FindSDL: Make FindSDL_*.cmake path suffixes consistent with main moduleBrad King2014-03-105-5/+15
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge topic 'fix-find_dependency-EXACT'Brad King2014-03-111-2/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 08ba128f find_dependency: Don't propagate EXACT argument.
| * | | | | | | | | find_dependency: Don't propagate EXACT argument.Stephen Kelly2014-03-061-2/+11
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'fix-Qt4-DBus-macro'Brad King2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | fc2bad57 Qt4: Use correct qdbus executable in macro.
| * | | | | | | Qt4: Use correct qdbus executable in macro.Stephen Kelly2014-03-101-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'dev/string-apis'Brad King2014-03-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | FindCUDA: Fix a typoBen Boeckel2014-03-081-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'python-3.4'Brad King2014-03-072-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | ab6201ab FindPython{Interp,Libs}: Search for Python 3.4.
| * | | | | | FindPython{Interp,Libs}: Search for Python 3.4.Matt McCormick2014-03-062-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Python 3.4.0rnc1 was released on 2014-02-20.
* | | | | | 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
View Lorry Controller Status