summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-default-install-config'Brad King2015-02-041-9/+5
|\ | | | | | | | | dea42d92 install: Fix regression in default configuration selection
| * install: Fix regression in default configuration selectionBen Boeckel2015-02-031-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | The refactoring in commit v3.1.0-rc1~812^2~16 (stringapi: Pass configuration names as strings, 2014-02-09) broke the code path in cmLocalGenerator::GenerateInstallRules that intends to pick a default install configuration for multi-config generators. Fix the logic to select an empty default configuration only when using a single-config generator whose CMAKE_BUILD_TYPE is not set. Inspired-by: Roman Wüger <roman.wueger@gmx.at> Reported-by: NoRulez <norulez@me.com>
* | Merge topic 'Qt-AUTOUIC-file-origin'Brad King2015-02-041-1/+2
|\ \ | | | | | | | | | | | | 2fed8e17 QtAutogen: Issue error message with origin file (#15342).
| * | QtAutogen: Issue error message with origin file (#15342).Stephen Kelly2015-02-031-1/+2
| | |
* | | CMake Nightly Date StampKitware Robot2015-02-041-1/+1
|/ /
* | Merge topic 'make-NOTPARALLEL-not-PHONY'Brad King2015-02-031-1/+1
|\ \ | | | | | | | | | | | | 3cec0c75 Makefile: Generate .NOTPARALLEL without .PHONY (#14312)
| * | Makefile: Generate .NOTPARALLEL without .PHONY (#14312)Brad King2015-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~222^2 (Makefile: Allow "gmake target1 target2 -j", 2013-12-18) we added generation of a .NOTPARALLEL rule and told the generator it is "symbolic" because the file will never be created. This causes ".PHONY" to be used. However, "clearmake" does not support parsing of .PHONY specifically for .NOTPARALLEL, so simply drop it. This should not affect the role of the .NOTPARALLEL rule for GNU make.
* | | CMake Nightly Date StampKitware Robot2015-02-031-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-02-021-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-02-011-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-01-311-1/+1
| | |
* | | Merge topic 'ctest_submmit-CDASH_UPLOAD-encode-url'Brad King2015-01-303-15/+31
|\ \ \ | | | | | | | | | | | | | | | | 18e3771a ctest_submit: Escape URL components in CDASH_UPLOAD mode
| * | | ctest_submit: Escape URL components in CDASH_UPLOAD modeBill Hoffman2015-01-303-15/+31
| | | | | | | | | | | | | | | | Call curl_easy_escape on arguments sent to CDash upload.
* | | | Merge topic 'feature-record-msvc'Brad King2015-01-303-6/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | d3489bdb Features: Record for MSVC 2010-2015 3228fc50 Features: Define meaning for no language standard default
| * | | | Features: Define meaning for no language standard defaultBrad King2015-01-293-6/+60
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define an empty string in CMAKE_<LANG>_STANDARD_DEFAULT to mean that the toolchain has no notion of lanuage standard levels. In this case the <LANG>_STANDARD[_REQUIRED] properties will have no effect. Update the RunCMake.CompileFeatures test to exclude the LinkImplementationFeatureCycle test when there is no standard default. It can never fail because no use of specific features will adjust the CXX_STANDARD level required for any target since the standard levels have no meaning in this case.
* | | | Merge topic 'fix-cpack-symlink-create-dir'Brad King2015-01-301-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55e68bc9 Merge branch 'backport-fix-cpack-symlink-create-dir' into fix-cpack-symlink-create-dir 4dc5acee CPack: Fix packaging of source tarballs with symbolic links 81221b80 CPack: Fix packaging of source tarballs with symbolic links
| * | | | CPack: Fix packaging of source tarballs with symbolic linksBill Hoffman2015-01-301-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | When staging the package installation, if the first file in a directory happens to be a symbolic link, make sure we create the directory before trying to create the link.
* | | | Merge topic 'ninja-msvc-only-C-and-CXX'Brad King2015-01-302-30/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8a93d3ea Ninja: Use "deps = msvc" only for C and CXX (#15253)
| * | | | Ninja: Use "deps = msvc" only for C and CXX (#15253)Brad King2015-01-292-30/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "/showIncludes" flag is only available with MS C and C++ compilers, and on compilers that "simulate" them (like Intel for Windows). Fix our logic to choose this type only for MS tools with these languages. All other cases need to use "deps = gcc" and define DEP_FILE in the build rule.
* | | | Merge topic 'vs-windows-store-default-language'Brad King2015-01-301-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 500794b0 VS: Set default language in generated Windows Phone and Store projects 4c5574a1 VS: Add missing newlines to .vcxproj generation
| * | | | VS: Set default language in generated Windows Phone and Store projectsRobert Goulet2015-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise building such projects gives: warning APPX1901: The DefaultLanguage property is either missing from the project file or does not have a value
| * | | | VS: Add missing newlines to .vcxproj generationRobert Goulet2015-01-291-2/+2
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2015-01-301-1/+1
|/ / /
* | | 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.