summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | | | Merge topic 'doc-link_libraries-note'Brad King2015-01-272-9/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | c7310917 Help: Clarify status of link_libraries command
| * | | | | | | | Help: Clarify status of link_libraries commandBrad King2015-01-262-9/+12
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command has been documented as 'deprecated', but it is not really slated for removal and can still be used. Clarify this in the documentation. While at it, revise the documentation to use wording more consistent with that now in target_link_libraries. Suggested-by: Christoph GrĂ¼ninger <foss@grueninger.de>
* | | | | | | | CMake Nightly Date StampKitware Robot2015-01-271-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'tests-RunCMake-make-program'Brad King2015-01-262-0/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 23bf98fc Tests/RunCMake: Honor CMAKE_MAKE_PROGRAM
| * | | | | | Tests/RunCMake: Honor CMAKE_MAKE_PROGRAMBrad King2015-01-242-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | If tests are using an explicit make program, pass it through to RunCMake tests so that any that actually do build use the expected tool.
* | | | | | Merge topic 'backport-kwsys-directory-check-opendir'Brad King2015-01-260-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 482c8475 KWSys Directory: Check opendir return value before using it (#15367)
| * | | | | | KWSys Directory: Check opendir return value before using it (#15367)Brad King2015-01-231-0/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | In Directory::GetNumberOfFilesInDirectory add a missing check for NULL.
* | | | | | Merge topic 'try-run-link-libraries'Brad King2015-01-2613-5/+66
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 tests for LINK_LIBRARIES with mock libraries.Matt McCormick2015-01-261-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the ExportImport test to try using an imported library with try_run.
| * | | | | try_run: Add test for bad link libraries.Matt McCormick2015-01-267-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Based off the corresponding try_compile test.
| * | | | | try_run: Add support for LINK_LIBRARIES option.Matt McCormick2015-01-265-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'FindCUDA-cusolver'Brad King2015-01-261-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d3d0c9 Help: Add notes for topic 'FindCUDA-cusolver'
| * | | | | | Help: Add notes for topic 'FindCUDA-cusolver'Brad King2015-01-231-0/+5
| | | | | | |
* | | | | | | Merge topic 'ExternalProject-switch-ALWAYS'Brad King2015-01-261-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4605973 ExternalProject: Allow ALWAYS step property to be switched (#15368)
| * | | | | | | ExternalProject: Allow ALWAYS step property to be switched (#15368)Brad King2015-01-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Within an existing build tree, if the stamp for a step already exists when one activates the ALWAYS option, we still want it to always build. Remove the step stamp file during CMake configuration to ensure it does not exist when the ALWAYS option is enabled.
* | | | | | | | Merge topic 'update-kwsys'Brad King2015-01-261-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 391748d5 Merge branch 'upstream-kwsys' into update-kwsys 0b9aad75 KWSys 2015-01-23 (d4e7f08e)