summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'watcom-updates'Brad King2014-03-205-23/+67
|\ | | | | | | | | | | | | | | 64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux 5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version 9292d3b8 Watcom: Detect compiler target architecture and platform fbc883c9 Watcom: Add one blank line to Makefile for better readability
| * 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 'ExternalProject-no-download-progress'Brad King2014-03-201-3/+11
|\ \ | | | | | | | | | | | | | | | f1b953ec Help: Add notes for topic 'ExternalProject-no-download-progress' 7d35b550 ExternalProject: Add option to disable download progress (#14807)
| * | ExternalProject: Add option to disable download progress (#14807)Brad King2014-03-171-3/+11
| |/ | | | | | | | | Add a DOWNLOAD_NO_PROGRESS option to disable progress reports while downloading source tarballs.
* | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2'Brad King2014-03-201-24/+31
|\ \ | | | | | | | | | | | | | | | cc5a0d8f FindPkgConfig: More unit tests 453d2b24 FindPkgConfig: small refactoring
| * | FindPkgConfig: small refactoringDaniele E. Domenichelli2014-03-171-24/+31
| |/
* | Merge topic 'CheckTypeSize_#14056'Brad King2014-03-201-3/+10
|\ \ | | | | | | | | | | | | | | | 7f857775 CheckTypeSize: Add unit test to cover the no-C case 7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
| * | CheckTypeSize: Support for CXX when C language is not enabledDaniele E. Domenichelli2014-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example now works without need to enable C language: cmake_minimum_required(VERSION x.x.x) project(foo CXX) include(CheckTypeSize) check_type_size("short" SIZEOF_SHORT LANGUAGE CXX) Fixes #14056
* | | Merge topic 'Android-platform'Brad King2014-03-201-0/+5
|\ \ \ | |_|/ |/| | | | | | | | 77f06b14 Modules: Add an Andriod platform file
| * | Modules: Add an Andriod platform fileStephen Kelly2014-03-201-0/+5
| |/ | | | | | | It is much like Linux but has no SONAME or RPATH.
* | 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)
generated by cgit v0.12 at 2025-01-06 21:46:26 (GMT)