summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Features: Define meaning for no language standard defaultBrad King2015-01-2911-42/+126
| | | | | | | | | | | | 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 branch 'release-3.1'Brad King2015-01-290-0/+0
|\
| * Merge branch 'ctest-update-gmake-error-match' into releaseBrad King2015-01-281-2/+2
| |\
| * \ Merge branch 'fix-OBJECT_DEPENDS-after-path-normalization' into releaseBrad King2015-01-285-0/+35
| |\ \
| * \ \ Merge branch 'OpenSSL_102' into releaseBrad King2015-01-281-1/+1
| |\ \ \
| * \ \ \ Merge branch 'doc-link_libraries-note' into releaseBrad King2015-01-262-9/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-kwsys-directory-check-opendir' into releaseBrad King2015-01-231-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FeatureSummary-fix-doc-typo' into releaseBrad King2015-01-231-2/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'xcode-revise-make-program'Brad King2015-01-297-30/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-297-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-297-0/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-287-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-295-0/+35
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 9259d778 Normalize OBJECT_DEPENDS paths to match custom commands (#15366)
| * | | | | | | | Normalize OBJECT_DEPENDS paths to match custom commands (#15366)Brad King2015-01-285-0/+35
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'OpenSSL_102'Brad King2015-01-281-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | c5d9a828 FindOpenSSL: fix detection of OpenSSL 1.0.2
| * | | | | | FindOpenSSL: fix detection of OpenSSL 1.0.2Guillaume Belz2015-01-271-1/+1
| |/ / / / /
* | | | | | Merge topic 'drop-win9x-reference'Brad King2015-01-281-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43eca402 drop reference to removed Windows 9x support
| * | | | | | drop reference to removed Windows 9x supportRolf Eike Beer2015-01-271-1/+0
| | | | | | |
* | | | | | | Merge topic 'shorten-test-paths'Brad King2015-01-289-30/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c50962 Tests: Shorten paths in ExternalProjectLocal 539c5c25 Tests: Shorten paths in RunCMake.CompileFeatures 494f6e8d Tests: Shorten paths in CompileDefinitions
| * | | | | | | Tests: Shorten paths in ExternalProjectLocalBrad King2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a shorter name for the external project base directory to allow longer CMake build tree directory names on Windows.
| * | | | | | | Tests: Shorten paths in RunCMake.CompileFeaturesBrad King2015-01-264-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten the NotAFeature_OriginDebug_target_compile_features case name to avoid creating really long paths that fail with some tools on Windows.
| * | | | | | | Tests: Shorten paths in CompileDefinitionsBrad King2015-01-254-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten the add_definitions command test directory and target names to avoid creating really long paths that fail with some tools on Windows. While at it, remove unnecessary project() command calls.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-01-281-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'file-strings-utf-16'Brad King2015-01-2716-4/+99
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2716-4/+99
| | | | | | | |
* | | | | | | | Merge topic 'test-features-enforce-expectation'Brad King2015-01-271-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67e76e82 Features: Fix test to reject missing expectation definitions 3046be77 Features: Emit a test failure if 'override' is present but not expected
| * | | | | | | | Features: Fix test to reject missing expectation definitionsBrad King2015-01-261-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever feature support is added to a compiler, the CompileFeatures test needs to be updated to set expected availability of features. Add #error directives to ensure the test fails if expectations are not set. Suggested-by: Stephen Kelly <steveire@gmail.com>
| * | | | | | | | Features: Emit a test failure if 'override' is present but not expectedStephen Kelly2015-01-261-0/+3
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-cmake-E-mode'Brad King2015-01-271-12/+108
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c49ce96 Help: Document 'cmake -E <command>' modes in cmake.1 manual
| * | | | | | | | | Help: Document 'cmake -E <command>' modes in cmake.1 manualBrad King2015-01-261-12/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a dedicated manual section, move the -E command documentation there, and elaborate.
* | | | | | | | | | Merge topic 'cmake-E-tar-files-from'Brad King2015-01-2716-0/+82
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44fd71de cmake: Teach "-E tar" command a "--files-from=" option
| * | | | | | | | | cmake: Teach "-E tar" command a "--files-from=" optionBrad King2015-01-2616-0/+82
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'test-rerun-cmake'Brad King2015-01-2714-0/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f2dc8dc configure_file: Test that CMake re-runs on input change or output missing daf95a38 try_compile: Test that CMake re-runs on input change
| * | | | | | | | | configure_file: Test that CMake re-runs on input change or output missingBrad King2015-01-276-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generators we expect that touching or modifying the input file of a configure_file, or removing its output, will cause CMake to re-run on the next build. Extend the RunCMake.configure_file test with a case covering this. Also check that CMake does not re-run if nothing has changed.
| * | | | | | | | | try_compile: Test that CMake re-runs on input changeBrad King2015-01-278-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile and Ninja generators we expect that touching the input source file for a try_compile will cause CMake to re-run on the next build. Extend the RunCMake.try_compile test with a case covering this. Also check that CMake does not re-run if nothing has changed.
* | | | | | | | | | Merge topic 'tests-RunCMake-normalize-newlines'Brad King2015-01-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf05938b Tests/RunCMake: Normalize newlines before checking actual output
| * | | | | | | | | Tests/RunCMake: Normalize newlines before checking actual outputBrad King2015-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We read the expected output with file(STRINGS) which converts CRLF newlines to LF. Do the same with the actual output before comparing.
* | | | | | | | | | 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-273-8/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbffaa0e Configure some CMake-provided targets with USES_TERMINAL (#14915)
| * | | | | | | | | | Configure some CMake-provided targets with USES_TERMINAL (#14915)Sylvain Joubert2015-01-273-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.