Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'CMakePushCheckState-fix-RESET' | Brad King | 2017-07-14 | 1 | -0/+22 |
|\ | |||||
| * | CMakePushCheckState: Fix cmake_push_check_state RESET argument | Brad King | 2017-07-12 | 1 | -0/+22 |
* | | Merge topic 'android-system-include-last' | Brad King | 2017-07-13 | 4 | -0/+31 |
|\ \ | |||||
| * | | Android: Always add standard include directories last | Brad King | 2017-07-13 | 4 | -0/+31 |
| * | | Merge branch 'vs-2017-sln-guid' into release-3.9 | Brad King | 2017-07-11 | 11 | -7/+18 |
| |\ \ | |||||
| * \ \ | Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9 | Brad King | 2017-07-11 | 8 | -0/+72 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bindexplib-revert-consts' into release-3.9 | Brad King | 2017-07-10 | 2 | -12/+0 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'autogen-no-generated-files' into release-3.9 | Brad King | 2017-07-07 | 2 | -0/+3 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge topic 'FindProtobuf-protoc-target' | Brad King | 2017-07-13 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | FindProtobuf: add target for protoc | André Apitzsch | 2017-07-12 | 1 | -0/+2 |
* | | | | | | | | Merge topic 'test_include_files' | Brad King | 2017-07-13 | 7 | -0/+79 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add TEST_INCLUDE_DIR[S] unit test | Matthew Woehlke | 2017-07-12 | 7 | -0/+79 |
* | | | | | | | | | Merge topic 'labels-for-subprojects' | Brad King | 2017-07-13 | 32 | -0/+483 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add tests for new directory labels and labels-for-subprojects features | Betsy McPhail | 2017-07-10 | 32 | -0/+483 |
* | | | | | | | | | | Merge topic 'vs-2017-sln-guid' | Brad King | 2017-07-12 | 11 | -7/+18 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | VS: Add SolutionGuid to generated .sln files | Brad King | 2017-07-11 | 11 | -7/+18 |
* | | | | | | | | | | Merge topic 'find_package-root-prefix-path-suffixes' | Brad King | 2017-07-12 | 8 | -0/+72 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths | Brad King | 2017-07-11 | 8 | -0/+72 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge topic 'bindexplib-revert-consts' | Brad King | 2017-07-12 | 2 | -12/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | bindexplib: Revert support for constants symbols | Brad King | 2017-07-10 | 2 | -12/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge topic 'FindMFC-try-static' | Brad King | 2017-07-11 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | FindMFC: Check for static MFC variant | Rich Chiodo | 2017-07-06 | 1 | -0/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge topic 'autogen-no-generated-files' | Brad King | 2017-07-10 | 2 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Autogen: Skip generated files for compatibility with CMake 3.8 | Brad King | 2017-07-07 | 2 | -0/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge topic 'find_package-restore-considered-configs' | Brad King | 2017-07-10 | 11 | -1/+45 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | find_package: Restore longer message when config files were considered | Brad King | 2017-07-07 | 11 | -1/+45 |
| |/ / / | |||||
| * | | | Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9 | Brad King | 2017-06-27 | 26 | -12/+30 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'vs-cuda-fix-flags' into release-3.9 | Brad King | 2017-06-27 | 1 | -0/+5 |
| |\ \ \ \ | |||||
* | | | | | | configure_file: Add support for indented cmakedefine | Sylvain Joubert | 2017-07-04 | 8 | -0/+60 |
| |_|_|/ / |/| | | | | |||||
* | | | | | XCTest: Speed up test by only enabling C language | Gregor Jasny | 2017-06-28 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge topic 'feature/include_guard' | Brad King | 2017-06-28 | 19 | -0/+126 |
|\ \ \ \ | |||||
| * | | | | include_guard: add tests for the feature | Pavel Solodovnikov | 2017-06-22 | 19 | -0/+126 |
* | | | | | Merge topic 'vs_csharp_custom_command' | Brad King | 2017-06-27 | 7 | -0/+83 |
|\ \ \ \ \ | |||||
| * | | | | | Vs: fix CSharp custom command by introducing inline MSBuild <Targets>s | Michael Stürmer | 2017-06-22 | 7 | -0/+83 |
* | | | | | | Merge topic 'fix-crash-on-non-enabled-language-features' | Brad King | 2017-06-27 | 26 | -12/+30 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | target_compile_features: Do not crash on non-enabled language | Brad King | 2017-06-26 | 4 | -0/+8 |
| * | | | | | Tests: Enable languages explicitly in RunCMake.target_compile_features | Brad King | 2017-06-26 | 22 | -12/+22 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'vs-rc-flags' into release-3.9 | Brad King | 2017-06-22 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'vs-cuda-fix-flags' into release-3.9 | Brad King | 2017-06-21 | 3 | -0/+9 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge topic 'vs-cuda-fix-flags' | Brad King | 2017-06-27 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | VS: Fix support for nvcc flags not in our flag table | Brad King | 2017-06-27 | 1 | -0/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge topic 'vs-rc-flags' | Brad King | 2017-06-22 | 1 | -0/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | |||||
| * | | | | VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS | Brad King | 2017-06-22 | 1 | -0/+4 |
* | | | | | Merge topic 'vs-cuda-fix-flags' | Brad King | 2017-06-22 | 3 | -0/+9 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | VS: Improve workaround for CUDA -Xcompiler placement bug | Brad King | 2017-06-21 | 1 | -0/+4 |
| * | | | | VS: Fix target_compile_options for CUDA | Brad King | 2017-06-21 | 2 | -0/+5 |
* | | | | | Merge topic 'cuda-macos-rpath-in-tests' | Brad King | 2017-06-22 | 7 | -23/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Tests: Simplify CUDA rpath on macOS | Brad King | 2017-06-21 | 7 | -23/+17 |
* | | | | | | Merge topic 'vs_fix_configuration_error' | Brad King | 2017-06-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Tests: Verify registry value is not "/registry" before using | Michael Stürmer | 2017-06-21 | 1 | -1/+1 |