summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge topic 'CPackDeb-doc-typos'Brad King2016-11-011-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | c75b8910 CPackDeb: fix copy-n-paste typos in documentation
| * | | | | | | | CPackDeb: fix copy-n-paste typos in documentationAlex Turbov2016-11-011-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-11-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'FindMatlab-fix-typo' into releaseBrad King2016-10-282-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindMatlab-9.1' into releaseBrad King2016-10-281-0/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'custom-command-CROSSCOMPILING_EMULATOR'Brad King2016-11-017-21/+77
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f648b9be Tests: Check that CROSSCOMPILING_EMULATOR is not used on imported targets e7480d67 Fix custom command target substitution with CROSSCOMPILING_EMULATOR
| * | | | | | | | | | Tests: Check that CROSSCOMPILING_EMULATOR is not used on imported targetsBrad King2016-10-284-6/+40
| | | | | | | | | | |
| * | | | | | | | | | Fix custom command target substitution with CROSSCOMPILING_EMULATORBrad King2016-10-283-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~88^2 (CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR, 2016-05-04) logic was introduced to substitute a target's `CROSSCOMPILING_EMULATOR` for argv0 in a custom command. However, it broke the case when the argv0 was a target name and now fails to expand the target name to its location at the same time as inserting the emulator. Fix the latter case. Inspired-by: Brian Maher <brian@brimworks.com> Closes: #16288
* | | | | | | | | | | Merge topic 'FindSDL-sound-fix'Brad King2016-11-011-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2ff9495 FindSDL_sound: Fix SDL_SOUND_LIBRARIES result value
| * | | | | | | | | | | FindSDL_sound: Fix SDL_SOUND_LIBRARIES result valueBrad King2016-10-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value is meant to be a plain-variable ;-list. Remove quotes and caching. Patch-by: Aleksey Chernov (virx on gitlab.kitware.com) Closes: #16390
* | | | | | | | | | | | Merge topic 'FindMatlab-fix-typo'Brad King2016-11-012-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2de7079 FindMatlab: Fix typo in matlab_add_unit_test implementation
| * | | | | | | | | | | FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in variable used to communicate between matlab_add_unit_test and its helper script MatlabTestsRedirect.cmake that was introduced in commit v3.7.0-rc1~116^2 (FindMatlab: Extend matlab_add_unit_test to run arbitrary test code, 2016-08-30).
* | | | | | | | | | | Merge topic 'FindMatlab-9.1'Brad King2016-11-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e29f33cd FindMatlab: Add support for Matlab 2016b (9.1)
| * | | | | | | | | | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'src-COMPILE_FLAGS-genex'Brad King2016-11-0115-15/+95
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a58517d Tests: Add case for Xcode per-config per-source COMPILE_FLAGS diagnostic 1e4bb358 Add generator expression support to per-source COMPILE_FLAGS
| * | | | | | | | | | Tests: Add case for Xcode per-config per-source COMPILE_FLAGS diagnosticBrad King2016-10-284-0/+14
| | | | | | | | | | |
| * | | | | | | | | | Add generator expression support to per-source COMPILE_FLAGSZsolt Parragi2016-10-2811-15/+81
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to specify different genex-based compile flags for each file in a target, e.g. compiling just a single file with `Od/Ox` in release builds on Visual Studio.
* | | | | | | | | | Merge topic 'st2-env-vars-variable'Brad King2016-11-015-1/+66
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95805d72 Sublime: Add option to specify env vars for the .sublime-project
| * | | | | | | | | | Sublime: Add option to specify env vars for the .sublime-projectBruno Pedrosa2016-10-275-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS` variable to control addition of env vars in the `.sublime-project`. Closes: #16387
* | | | | | | | | | | Merge topic 'clang-tidy'Brad King2016-11-0120-48/+46
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5214bb35 Avoid some copies 602b78aa Remove redundant c_str() calls c58c739d Use the empty method to check for emptiness
| * | | | | | | | | | | Avoid some copiesDaniel Pfeifer2016-10-305-16/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Remove redundant c_str() callsDaniel Pfeifer2016-10-3014-29/+26
| | | | | | | | | | | |
| * | | | | | | | | | | Use the empty method to check for emptinessDaniel Pfeifer2016-10-302-3/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'intel-compile-features-windows'Brad King2016-11-016-41/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 369d5809 Features: Record features for Intel Compiler on Windows a5a3642f Features: Port Intel CXX features to test macros where possible d34ac22f Features: Unset Intel CXX feature temporaries 967dcf36 Intel: Remove incorrect C++98 standard compiler flag on Windows
| * | | | | | | | | | | Features: Record features for Intel Compiler on WindowsBrad King2016-10-276-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this compiler always defines `__cplusplus` to `1` we need to use `_MSC_VER`, `__INTEL_CXX11_MODE__`, and the feature test macro named `__cpp_aggregate_nsdmi` to detect C++11 and C++14 modes. With no `-Qstd=` flag this compiler defaults to C++98 plus a subset of C++11/C++14 features needed to be compatible with MSVC. We pretend it is plain C++98 and add a `-Qstd=` flag whenever needed for C++11 or above features even if they would happen to be available in MSVC-mode. Closes: #16384
| * | | | | | | | | | | Features: Port Intel CXX features to test macros where possibleBrad King2016-10-271-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel 16 and 17 compilers define feature test macros of the form `__cpp_<feature>`. Use them where possible to detect corresponding features.
| * | | | | | | | | | | Features: Unset Intel CXX feature temporariesBrad King2016-10-271-0/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Intel: Remove incorrect C++98 standard compiler flag on WindowsBrad King2016-10-271-5/+6
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 05e05cd2 (Intel: Fix compiler C++98 standard flag on Windows, 2016-10-26) was wrong. The Intel C++ Compiler for Windows does not support either `-Qstd=c++98` or `-Qstd=gnu++98`. Simply remove both flags for this compiler and use no options at all to achieve this mode. Issue: #16384
* | | | | | | | | | | Merge topic 'ninja-windows-POST_BUILD-noop'Brad King2016-11-014-7/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 353f6362 Ninja: Fix POST_BUILD noop on Windows
| * | | | | | | | | | Ninja: Fix POST_BUILD noop on WindowsBrad King2016-10-284-7/+11
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `cd .` instead of `:` in a Windows shell. Closes: #16393
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-11-011-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-311-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-10-301-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-10-291-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'release'Brad King2016-10-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'cmake-server-handshake-improvements' into releaseBrad King2016-10-284-66/+104
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'intel-17-features' into releaseBrad King2016-10-261-3/+3
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cmake-server-handshake-improvements'Brad King2016-10-284-66/+104
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42ccbee1 server-mode: Handle generator toolset and platform in handshake d792491c cmake-server: Better error reporting during handshake
| * | | | | | | | server-mode: Handle generator toolset and platform in handshakeTobias Hunger2016-10-283-2/+35
| | | | | | | | |
| * | | | | | | | cmake-server: Better error reporting during handshakeTobias Hunger2016-10-272-66/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch more problematic input during handshake and report failure. These were caught before when trying to configure, but it is way better to get these reports early.
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-281-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'include-what-you-use'Brad King2016-10-27163-107/+962
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e81c323d Include necessary headers in commands
| * | | | | | | | Include necessary headers in commandsDaniel Pfeifer2016-10-26163-107/+962
| | | | | | | | |
* | | | | | | | | Merge topic 'consoleBuf'Brad King2016-10-274-0/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 335a29cb Enable Unicode output to Windows consoles
| * | | | | | | | | Enable Unicode output to Windows consolesDāvis Mosāns2016-10-264-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use KWSys ConsoleBuf to replace the `streambuf` on `std::cout` and `std::cerr` so that process output can be encoded correctly for display in a Windows console.
* | | | | | | | | | Merge topic 'intel-compiler-windows-c++98'Brad King2016-10-271-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05e05cd2 Intel: Fix compiler C++98 standard flag on Windows
| * | | | | | | | | | Intel: Fix compiler C++98 standard flag on WindowsBrad King2016-10-261-1/+5
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel C++ Compiler for Windows does not support the `-Qstd=c++98` flag but does support `-Qstd=gnu++98`. Issue: #16384
* | | | | | | | | | Merge topic 'intel-17-features'Brad King2016-10-271-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 554b4f90 Features: Record features for Intel C++ 17 on UNIX
| * | | | | | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16384
* | | | | | | | | | Merge topic 'vs-fix-no-toolset'Brad King2016-10-271-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0caca40f VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express