summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'threads-cleanup'Brad King2014-03-271-17/+16
|\ | | | | | | | | | | | | 693f8bf3 FindThreads: simplify checking for SunOS 858ce31f FindThreads: avoid useless checks if a thread library is already found fdf7bd27 FindThreads: replace MATCHES with STREQUAL
| * FindThreads: simplify checking for SunOSRolf Eike Beer2014-03-251-1/+1
| |
| * FindThreads: avoid useless checks if a thread library is already foundRolf Eike Beer2014-03-251-16/+15
| |
| * FindThreads: replace MATCHES with STREQUALRolf Eike Beer2014-03-251-1/+1
| |
* | Merge topic 'dev/find-boost-graph_parallel'Brad King2014-03-261-1/+2
|\ \ | | | | | | | | | | | | f284b003 FindBoost: Search next to MPI libs for graph_parallel (#14832)
| * | FindBoost: Search next to MPI libs for graph_parallel (#14832)Ben Boeckel2014-03-251-1/+2
| |/ | | | | | | | | In addition to the MPI libraries, graph_parallel lives in the MPI libdir as well.
* | Merge topic 'simplify-empty-LDFLAGS'Brad King2014-03-261-6/+12
|\ \ | | | | | | | | | | | | 1b18f442 Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
| * | Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is emptyJiri Malak2014-03-241-6/+12
| |/
* | Merge topic 'FindPkgConfig-stop-on-missing'Brad King2014-03-261-1/+1
|\ \ | | | | | | | | | | | | 63a4c0af FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
| * | FindPkgConfig: Stop processing when REQUIRED package not found (#14381)Christoph Grüninger2014-03-241-1/+1
| |/ | | | | | | Make the behavior similar to find_package.
* | Merge topic 'haiku-updates'Brad King2014-03-261-11/+16
|\ \ | | | | | | | | | | | | | | | 0cc42b87 Haiku: Fix compiler detection when using distcc 84603d80 Haiku: Enable CMake builtin ELF editor
| * | Haiku: Fix compiler detection when using distccAdrien Destugues2014-03-211-11/+16
| |/ | | | | | | Also remove outdated include directories.
* | Merge topic 'fix-Qt4-moc-commands-depends'Brad King2014-03-261-1/+1
|\ \ | | | | | | | | | | | | 734df96f Qt4: Fix moc command dependencies for incremental build.
| * | Qt4: Fix moc command dependencies for incremental build.Stephen Kelly2014-03-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~327^2 (Qt4Macros: Allow specifying a TARGET in invokations of macros., 2013-02-26), a parameters file is populated with moc arguments at generate-time. When the compile definitions or include directories change, the parameters file is updated but moc is not re-run in response. Fix that by making the moc invocation depend on the parameters file. Reported-At: https://bugreports.qt-project.org/browse/QTBUG-36970
* | Merge topic 'UseJava-fix-resource-copy'Brad King2014-03-261-3/+5
|\ \ | | | | | | | | | | | | 2abd8efe UseJava: Copy resource files before compiling the jar (#13360)
| * | UseJava: Copy resource files before compiling the jar (#13360)Bruno Nova2014-03-201-3/+5
| |/ | | | | | | Co-Author: Mary Ellen Foster <mefoster@gmail.com>
* | Merge topic 'compile-m-as-c'Brad King2014-03-262-2/+2
|\ \ | | | | | | | | | | | | 95cdf132 Treat .m files consistently as C across all generators
| * | Treat .m files consistently as C across all generatorsTim Blechmann2014-03-202-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objective C sources should be compiled with the C compiler, not C++. The Xcode generator correctly classifies ".m" sources already. The cmSystemTools::GetFileFormat method was fixed by commit v2.8.0~1782 (fix for 7045, use gcc for .m, 2008-08-19) but it is not used by any of the generator since commit v2.4.0~2819 (major changes to support addition of languages, 2004-09-22). Fix the CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS table entries so that cmGlobalGenerator::GetLanguageFromExtension tells the Makefile, Ninja, and VS IDE generators to compile ".m" sources as C. This makes behavior consistent on all generators. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | Merge topic 'UseSWIG-revert-bad-fix-0010080'Brad King2014-03-261-4/+3
|\ \ | |/ |/| | | | | d9760647 Revert "UseSWIG: Name extra generated files after module name (#10080)"
| * Revert "UseSWIG: Name extra generated files after module name (#10080)"Julien Schueller2014-03-201-4/+3
| | | | | | | | This reverts commit f0111deb1ea21f667b2fbf57f55d5ee2a80f5ccc.
* | 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.
generated by cgit v0.12 at 2024-12-30 22:56:52 (GMT)