summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ctest_coverage: Search for Jacoco files in the binary directoryZack Galbreath2015-11-161-4/+21
| | | | | Search for Jacoco coverage files in both the source directory and the binary directory.
* Merge branch 'release'Brad King2015-10-290-0/+0
|\
| * Merge branch 'intel-fortran-2016' into releaseBrad King2015-10-291-1/+3
| |\
* | \ Merge topic 'intel-fortran-2016'Brad King2015-10-291-1/+3
|\ \ \ | | |/ | |/| | | | | | | 77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)
| * | Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)Brad King2015-10-261-1/+3
| | |
* | | Merge topic 'README-fix-typo'Brad King2015-10-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 6c0d8a5d README: Fix typo in wording
| * | | README: Fix typo in wordingTerrell Russell2015-10-291-1/+1
|/ / /
* | | Merge branch 'release'Brad King2015-10-290-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'backport-revert-autorcc-qt-5.1' into releaseBrad King2015-10-291-1/+1
| |\ \
| * \ \ Merge branch 'vs-resw-files' into releaseBrad King2015-10-291-0/+4
| |\ \ \
| * \ \ \ Merge branch 'cpack-deb-fakeroot-removal' into releaseBrad King2015-10-231-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-test-RUN_SERIAL-failure-regression' into releaseBrad King2015-10-235-5/+31
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-add_executable-typo' into releaseBrad King2015-10-221-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'vs-resw-files'Brad King2015-10-291-0/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 77dde5cb VS: Add support for `.resw` files (#15811)
| * | | | | | | VS: Add support for `.resw` files (#15811)Andrew Shaitorov2015-10-281-0/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | These are used on the WinRT & WinPhone platforms. Build them using the `PRIResource` tool.
* | | | | | | Merge topic 'cpack-osx-sysroot'Brad King2015-10-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
| * | | | | | | CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)Brad King2015-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We support setting CMAKE_OSX_SYSROOT to a symbolic value like "macosx". Modules/Platform/Darwin-Initialize.cmake takes care of finding the actual SDK path on disk. Use that result to set CPACK_OSX_SYSROOT instead.
* | | | | | | | Merge topic 'bootstrap-cleanup'Brad King2015-10-291-7/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b0c0743 bootstrap: Drop unused KWSys header directories
| * | | | | | | | bootstrap: Drop unused KWSys header directoriesBrad King2015-10-281-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KWSys no longer needs the cmsys/{ios,stl} directories so we no longer populate them. We no longer need to create them either.
* | | | | | | | | Merge topic 'FindPkgConfig-better-error'Brad King2015-10-292-5/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bfb527f FindPkgConfig: return actual error when a package is not found (#15810)
| * | | | | | | | | FindPkgConfig: return actual error when a package is not found (#15810)Benjamin Chrétien2015-10-282-5/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, CMake returned the following error: -- Checking for module 'foo' -- Package 'foo' not found When the actual error returned by pkg-config was: Package 'bar', required by 'foo', not found Now, the actual error is forwarded to the user. -- Checking for module 'foo' -- Package 'bar', required by 'foo', not found For the standard case (i.e. the package was indeed not found), the CMake error was: -- Checking for module 'foo' -- Package 'foo' not found But it now prints: -- Checking for module 'foo' -- No package 'foo' found The associated test was also updated. ${last} refers to the last CLI argument.
* | | | | | | | | Merge topic 'autorcc-qt-5.1-compat'Brad King2015-10-291-1/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
| * | | | | | | | | QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)Brad King2015-10-281-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) we added use of the rcc `--list` option. Prior to Qt 5.2 this option was called just `-list`. Run `rcc --help` to check for support for `--list` before using it and otherwise fall back to the `-list` option for compatibility with older versions.
* | | | | | | | | | Merge topic 'revert-autorcc-qt-5.1'Brad King2015-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1 10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)" b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
| * | | | | | | | | Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1Brad King2015-10-270-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"Brad King2015-10-271-1/+1
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0. The `-list` option is not documented and may be removed in future Qt versions. Fixing this correctly will require detecting the availability of `--list` or `-list` based on the `rcc` version found. For now we choose to support the documented option that will be supported in future Qt versions.
| * | | | | | | | Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"Brad King2015-10-271-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0. The `-list` option is not documented and may be removed in future Qt versions. Fixing this correctly will require detecting the availability of `--list` or `-list` based on the `rcc` version found. For now we choose to support the documented option that will be supported in future Qt versions.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-10-291-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'minor-cleanups'Brad King2015-10-2822-48/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13a37f5f cmMakefile: Fix typo in comment 958508bb cmMakefile: Fix style 91a829c1 Makefiles: Remove unused variable e0213882 cmTarget: Remove obsolete member 0554c2c9 cmTarget: Fix style b22e5d0a Remove some obsolete declarations ce43ed2c Use LocalGenerator when possible d90c9738 Makefiles: Remove some unneeded casts 331023ae Export: Remove unused variable a03f3d0e cmFunctionBlocker: Constify method d50c4220 Xcode: Fix typo in comment 803f1901 Xcode: Remove trailing semicolon
| * | | | | | | cmMakefile: Fix typo in commentStephen Kelly2015-10-271-1/+1
| | | | | | | |
| * | | | | | | cmMakefile: Fix styleStephen Kelly2015-10-271-1/+1
| | | | | | | |
| * | | | | | | Makefiles: Remove unused variableStephen Kelly2015-10-271-1/+0
| | | | | | | |
| * | | | | | | cmTarget: Remove obsolete memberStephen Kelly2015-10-272-5/+0
| | | | | | | |
| * | | | | | | cmTarget: Fix styleStephen Kelly2015-10-271-1/+2
| | | | | | | |
| * | | | | | | Remove some obsolete declarationsStephen Kelly2015-10-2713-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that cmStandardIncludes.h is included before any platform header in cmGeneratorExpressionEvaluator.h. That file needs to change as a result of removal of the cmMakefile.h header from cmGeneratorExpressionNode.h, affecting the compilation of cmGeneratorExpressionNode.cxx. On AIX we need to include our own headers first to get large file support macros defined consistently within system headers. The old order in this header worked only because it was always included after other headers.
| * | | | | | | Use LocalGenerator when possibleStephen Kelly2015-10-263-12/+12
| | | | | | | |
| * | | | | | | Makefiles: Remove some unneeded castsStephen Kelly2015-10-262-4/+3
| | | | | | | |
| * | | | | | | Export: Remove unused variableStephen Kelly2015-10-261-1/+0
| | | | | | | |
| * | | | | | | cmFunctionBlocker: Constify methodStephen Kelly2015-10-261-1/+1
| | | | | | | |
| * | | | | | | Xcode: Fix typo in commentStephen Kelly2015-10-261-1/+1
| | | | | | | |
| * | | | | | | Xcode: Remove trailing semicolonStephen Kelly2015-10-261-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'use-generator-target'Brad King2015-10-2849-409/+622
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79c3a2a8 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget c389f8bb cmLocalGenerator: Port Find method away from GetGeneratorTarget 02533038 VS6: Port to FindGeneratorTarget b6278e9f cmake: Port find_package mode away from GetGeneratorTarget 7a6caae1 cmMakefile: Add imported target accessor 0fb187cc CMP0026: Port away from GetGeneratorTarget 8caf1f36 cmGlobalGenerator: Add FindGeneratorTarget API 278ba2db cmGeneratorTarget: Add API for globally visible IMPORTED 79c11d23 Xcode: Port away from GetGeneratorTarget 9b244cc0 cmLocalGenerator: Store imported targets in a separate container. def6da61 cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget a67231ac cmTarget: Implement ALIAS in terms of name mapping d566f39a cmGlobalGenerator: Remove unneeded GetGeneratorTarget 0c97d32f cmGlobalGenerator: Remove direct storage of targets 383bfd95 cmTargetCollectLinkLanguages: Remove cmMakefile dependency 7f6bedda cmGeneratorTarget: Port cmOptionalLinkImplementation ...
| * | | | | | | | cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTargetStephen Kelly2015-10-278-42/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configure-time and generate-time types should be completely independent. Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.
| * | | | | | | | cmLocalGenerator: Port Find method away from GetGeneratorTargetStephen Kelly2015-10-274-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror the cmMakefile::FindTarget method.
| * | | | | | | | VS6: Port to FindGeneratorTargetStephen Kelly2015-10-271-5/+4
| | | | | | | | |
| * | | | | | | | cmake: Port find_package mode away from GetGeneratorTargetStephen Kelly2015-10-271-4/+7
| | | | | | | | |
| * | | | | | | | cmMakefile: Add imported target accessorStephen Kelly2015-10-272-0/+13
| | | | | | | | |
| * | | | | | | | CMP0026: Port away from GetGeneratorTargetStephen Kelly2015-10-271-3/+3
| | | | | | | | |
| * | | | | | | | cmGlobalGenerator: Add FindGeneratorTarget APIStephen Kelly2015-10-272-0/+54
| | | | | | | | |
| * | | | | | | | cmGeneratorTarget: Add API for globally visible IMPORTEDStephen Kelly2015-10-272-0/+6
| | | | | | | | |