summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for the ARM Compiler (arm.com)Joakim Andersson2015-11-028-0/+69
| | | | | | | | Create an `ARMCC` compiler id corresponding to compilers identified and versioned by the `__ARMCC_VERSION` predefined macro. See documentation for the compilers at http://infocenter.arm.com/help/topic/com.arm.doc.set.swdev/index.html
* Merge branch 'release'Brad King2015-11-020-0/+0
|\
| * Merge branch 'doc-apple-info-plist-properties' into releaseBrad King2015-10-302-29/+37
| |\
| * \ Merge branch 'fix-find_program-regression' into releaseBrad King2015-10-305-0/+27
| |\ \
* | \ \ Merge topic 'macosx_rpath-clarify-doc'Brad King2015-11-021-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f8eb72fe Help: Clarify documentation for MACOSX_RPATH variable.
| * | | | Help: Clarify documentation for MACOSX_RPATH variable.Clinton Stimpson2015-11-021-5/+10
| | | | |
* | | | | Merge topic 'doc-apple-info-plist-properties'Brad King2015-11-022-29/+37
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 9a7f042a Help: Document target properties setting Info.plist fields (#15820)
| * | | | Help: Document target properties setting Info.plist fields (#15820)Brad King2015-10-302-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and specify for each property what field in the Info.plist file it sets.
* | | | | Merge topic 'xcode-lastupgradecheck'Brad King2015-11-021-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
| * | | | | Xcode: Set LastUpgradeCheck to current Xcode version (#15817)Gregor Jasny2015-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This prevents the project settings upgrade warning.
* | | | | | Merge topic 'fix-find_program-regression'Brad King2015-11-025-0/+27
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 31e6571c find_program: Fix regression in finding an already-known path
| * | | | | find_program: Fix regression in finding an already-known pathBrad King2015-10-305-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement search using more flexible approach, 2015-09-01) did not preserve the behavior of looking for the given name with no search path at all. Fix this and add a test case covering finding an absolute path with no search directories.
* | | | | | CMake Nightly Date StampKitware Robot2015-11-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-11-011-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-10-311-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-10-301-1/+1
| | | | |
* | | | | 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.