summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode-revise-make-program'Brad King2015-01-293-21/+52
|\ | | | | | | | | | | | | ab9fa54d Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324) 11e2e6ca Xcode: Select make program at build time e4055a61 Xcode: Add internal API to find xcodebuild
| * Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)Brad King2015-01-293-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | The "cmakexbuild" wrapper is not needed for Xcode 4 and above, and the path to it may change when CMake moves. Avoid storing a specific path to a build program in CMakeCache.txt and instead compute the value for CMAKE_MAKE_PROGRAM on demand. However, if a user does set the value explicitly then honor it. This does for Xcode what commit v3.0.0-rc1~260^2~4 (VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators, 2013-11-15) did for Visual Studio generators.
| * Xcode: Select make program at build timeBrad King2015-01-281-1/+1
| | | | | | | | | | | | | | Extend the change made in commit v3.0.0-rc1~260^2~16 (Teach GenerateBuildCommand to find its own make program, 2013-11-13) to have the Xcode generator pick between "xcodebuild" and CMake's own copy of "cmakexbuild" at build time based on the version of Xcode.
| * Xcode: Add internal API to find xcodebuildBrad King2015-01-282-0/+36
| | | | | | | | | | | | | | | | Teach the Xcode generator to compute the location of this tool or the cmakexbuild wrapper. Add internal APIs to get the locations on demand. Use the "cmakexbuild" wrapper for Xcode < 4, and "xcodebuild" for modern Xcode.
* | Merge topic 'vs-shader-flags'Brad King2015-01-291-0/+13
|\ \ | | | | | | | | | | | | 4775c901 VS: Add source file property to set extra hlsl shader flags
| * | VS: Add source file property to set extra hlsl shader flagsRobert Goulet2015-01-281-0/+13
| | | | | | | | | | | | | | | Create a VS_SHADER_FLAGS source file property so that we can set all other Visual Studio .hlsl shader file compilation flags.
* | | Merge topic 'ctest-update-gmake-error-match'Brad King2015-01-291-2/+2
|\ \ \ | | | | | | | | | | | | | | | | d52b5f88 ctest_build: Update GNU make error message matching (#15379)
| * | | ctest_build: Update GNU make error message matching (#15379)Marco Nolden2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The "No rule to make target" error message of gmake is not correctly recognized since GNU make changed the quoting style in commit 23c2b99e9d (Convert all "`'" quotes to "''" per new GNU Coding Standard guidelines, 2012-03-04). Fix our regex to match both old and new quoting styles.
* | | | Merge topic 'fix-OBJECT_DEPENDS-after-path-normalization'Brad King2015-01-292-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9259d778 Normalize OBJECT_DEPENDS paths to match custom commands (#15366)
| * | | | Normalize OBJECT_DEPENDS paths to match custom commands (#15366)Brad King2015-01-282-0/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom command path normalization added in commit v3.1.0-rc1~471^2 (add_custom_command: Normalize OUTPUT and DEPENDS paths, 2014-05-28) broke use of OBJECT_DEPENDS to bring in custom commands because the latter paths were not normalized too. Normalize them and add a test case. Reported-by: Daniel v. Gerpen
* | | | CMake Nightly Date StampKitware Robot2015-01-291-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2015-01-281-1/+1
| |/ |/|
* | Merge topic 'file-strings-utf-16'Brad King2015-01-271-3/+61
|\ \ | | | | | | | | | | | | 1f77a700 file: Teach STRINGS to support UTF-16 and UTF-32 encodings
| * | file: Teach STRINGS to support UTF-16 and UTF-32 encodingsJustin Borodinsky2015-01-271-3/+61
| | |
* | | Merge topic 'cmake-E-tar-files-from'Brad King2015-01-271-0/+53
|\ \ \ | | | | | | | | | | | | | | | | 44fd71de cmake: Teach "-E tar" command a "--files-from=" option
| * | | cmake: Teach "-E tar" command a "--files-from=" optionBrad King2015-01-261-0/+53
| |/ / | | | | | | | | | | | | | | | Read file names from the lines of a specified file. Reject input lines starting in '-' to leave room for option parsing to be added later. Add just '--add-file=' now to allow files starting in '-' to be specified.
* | | Merge topic 'cmake-gui-osx'Brad King2015-01-273-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8ced6375 cmake-gui: Shrink spacing between search field and checkbox. b46a1519 cmake-gui: Change install buttons to activate on clicked instead of pressed. c19539c5 cmake-gui: Fix install menu to be available for Qt5 builds on OS X.
| * | | cmake-gui: Shrink spacing between search field and checkbox.Kevin Wojniak2015-01-261-1/+1
| | | | | | | | | | | | | | | | This allows the search field to show on OS X Yosemite
| * | | cmake-gui: Change install buttons to activate on clicked instead of pressed.Kevin Wojniak2015-01-261-3/+3
| | | | | | | | | | | | | | | | This matches the behavior of other buttons.
| * | | cmake-gui: Fix install menu to be available for Qt5 builds on OS X.Kevin Wojniak2015-01-261-1/+1
| |/ /
* | | Merge topic 'cmake-builtin-targets-use-ninja-terminal'Brad King2015-01-271-7/+7
|\ \ \ | | | | | | | | | | | | | | | | bbffaa0e Configure some CMake-provided targets with USES_TERMINAL (#14915)
| * | | Configure some CMake-provided targets with USES_TERMINAL (#14915)Sylvain Joubert2015-01-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make them use the 'console' pool with the Ninja generator. Impacted targets are: - Built-in targets: install, install/local, install/strip, tests, package, package_source, rebuild_cache - Targets provided by the CTestTargets module: Nightly, Continuous, Experimental, and all their variants (*Start, *Configure, ...)
* | | | Merge topic 'load-initial-cache-from-stderr-to-stdout'Brad King2015-01-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6cc0f6b5 cmake: Display "loading initial cache" message on stdout
| * | | | cmake: Display "loading initial cache" message on stdoutJean-Christophe Fillion-Robin2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This message has been on stderr since the "-C" option was first added, but it is informational and not an error. Other informational messages go to stdout, so send this one there too.
* | | | | CMake Nightly Date StampKitware Robot2015-01-271-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'try-run-link-libraries'Brad King2015-01-262-2/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | d0adcccb try_run: Add tests for LINK_LIBRARIES with mock libraries. 223c5cb7 try_run: Add test for bad link libraries. e2b1f058 try_run: Add support for LINK_LIBRARIES option.
| * | | try_run: Add support for LINK_LIBRARIES option.Matt McCormick2015-01-262-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most functionality is already implemented in Source/cmCoreTryCompile.{h,cxx}. Document and improve argument parsing. This functionality is already being used by a number of modules, like CheckCSourceCompiles.cmake, but it is not documented.
* | | | Merge topic 'update-kwsys'Brad King2015-01-261-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 391748d5 Merge branch 'upstream-kwsys' into update-kwsys 0b9aad75 KWSys 2015-01-23 (d4e7f08e)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-01-241-0/+5
| | |/ / | |/| |
* | | | Merge topic 'ninja-rsp_file-calculation'Brad King2015-01-261-7/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 097e26f4 ninja: use the minimum of all command line length limits (#14892)
| * | | | ninja: use the minimum of all command line length limits (#14892)Ben Boeckel2015-01-231-7/+22
| | |_|/ | |/| | | | | | | | | | | | | | | | | | When choosing whether to use a response file, consider several possible command line length limits for the current operating system, and choose the smallest.
| * | | CMake 3.1.1v3.1.1Brad King2015-01-201-1/+1
| | | |
| * | | Merge branch 'xcode-target-sort' into releaseBrad King2015-01-192-14/+54
| |\ \ \
| * \ \ \ Merge branch 'release-3.0' into releaseBrad King2015-01-161-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'eclipse-fix-cxx-natures' into release-3.0Brad King2015-01-161-0/+1
| | |\ \ \ \
| | * | | | | CMake 3.0.2v3.0.2Brad King2014-09-081-1/+1
| | | | | | |
| | * | | | | Merge branch 'backport-xcode-duplicate-file-refs' into releaseBrad King2014-09-031-6/+4
| | |\ \ \ \ \
| | | * | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
| | * | | | | | Merge branch 'fix-lexer-open-square' into releaseBrad King2014-08-182-33/+49
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'backport-OpenRISC-1000-support' into releaseBrad King2014-08-111-0/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | KWSys CPU: Add support for OpenRISC 1000Christian Svensson2014-08-071-0/+4
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'backport-fix-CMP0047-IS_GNU-vars' into releaseBrad King2014-08-111-0/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behaviorBrad King2014-08-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of CMP0047 detects the QNX compiler id internally, then changes it to GNU after the language is fully enabled. This is too late to correctly set the old IS_GNU variables, so set them as part of the policy OLD behavior. Reported-by: Mike Lattanzio <mlattanzio@blackberry.com>
| | * | | | | | | | Merge branch 'fix-Qt-Autogen' into releaseBrad King2014-08-112-5/+10
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | CMake 3.0.1v3.0.1Brad King2014-07-301-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'xcode-6-librarian-flags' into releaseBrad King2014-07-282-5/+24
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'backport-kwsys-qnx-fix' into releaseBrad King2014-07-171-1/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | KWSys SystemInformation: No SA_RESTART on QNXBob E2014-07-171-1/+4
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX not support SA_RESTART signal: /* #define SA_RESTART 0x0040 (not supported yet) */ Use it in SystemInformation only if it is defined.
| | * | | | | | | | | Merge branch 'install-cfbundle-directory' into releaseBrad King2014-07-101-0/+14
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'bootstrap-cmake-locations' into releaseBrad King2014-06-251-1/+6
| | |\ \ \ \ \ \ \ \ \ \