summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-autogen_noqt_warning' into release-3.13Brad King2019-01-117-0/+46
|\
| * Tests: Add case for warning when AUTOMOC/UIC/RCC gets disabledBrad King2019-01-116-0/+21
| * Autogen: Issue a warning when AUTOMOC/UIC/RCC gets disabled.Sebastian Holtermann2019-01-101-0/+25
|/
* Merge branch 'cmake-CDU-option-parsing' into release-3.13Brad King2019-01-1013-1/+37
|\
| * Tests: Add cases for -{C,D,U} without a source treeBrad King2019-01-1012-1/+22
| * cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2019-01-101-0/+15
* | Merge branch 'feature/fix-link_resolved_item_into_bundle' into release-3.13Craig Scott2019-01-091-0/+3
|\ \
| * | BundleUtilities: Ensure target dir exists when creating symlinksTim Blechmann2019-01-081-0/+3
| |/
* | Merge branch 'vs2017-skip-2019' into release-3.13Brad King2019-01-081-0/+9
|\ \ | |/ |/|
| * VS: Exclude VS 2019 instances when using VS 2017 generatorBrad King2019-01-081-0/+9
|/
* CMake 3.13.2v3.13.2Brad King2018-12-131-1/+1
* Merge branch 'cuda-arch-turing' into release-3.13Brad King2018-12-101-2/+16
|\
| * CUDA: Add CUDA 10 (Turing) detectionAnton Chernov2018-12-101-2/+16
* | Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13Brad King2018-12-073-6/+24
|\ \
| * | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-073-6/+24
| |/
* | Merge branch 'cpack-status-callback' into release-3.13Brad King2018-12-073-0/+13
|\ \
| * | CPack/External: Fix status messages of staging scriptsNils Gladitz2018-12-073-0/+13
| |/
* | Merge branch 'cuda-external' into release-3.13Brad King2018-12-056-1/+20
|\ \ | |/ |/|
| * CUDA: Fix crash on linking to a CUDA target without CUDA enabledBrad King2018-12-056-1/+20
|/
* CMake 3.13.1v3.13.1Brad King2018-11-281-1/+1
* Merge branch 'autogen_uic_empty_fix_3_13' into release-3.13Brad King2018-11-271-1/+1
|\
| * Autogen: Fix empty uic executable stringSebastian Holtermann2018-11-271-1/+1
* | Merge branch 'vs2015-no-sdk' into release-3.13Brad King2018-11-261-17/+21
|\ \
| * | VS: Avoid crash with VS 2015 when all SDKs are higher than 10.0.14393.0Harry Mallon2018-11-261-17/+21
| |/
* | Merge branch 'FindBoost-no-cxx' into release-3.13Brad King2018-11-264-6/+6
|\ \
| * | FindBoost: Restore finding without CXX language enabledBrad King2018-11-264-6/+6
| |/
* | Merge branch 'fortran-submodule-case' into release-3.13Brad King2018-11-203-117/+117
|\ \ | |/ |/|
| * Fortran: Fix module dependency scanning with upper-case SUBMODULEBrad King2018-11-203-117/+117
|/
* CMake 3.13.0v3.13.0Brad King2018-11-201-1/+1
* Merge branch 'blas-pkgcfg' into release-3.13Brad King2018-11-191-0/+1
|\
| * FindBLAS: Restore BLAS_FOUND when found using pkgconfigMartin von Gagern2018-11-191-0/+1
* | Merge branch 'FindPython-lib-arch' into release-3.13Brad King2018-11-191-0/+17
|\ \
| * | FindPython: Ensure config tool matches library architectureMarc Chevrier2018-11-191-0/+17
| |/
* | Merge branch 'irsl-ucrt-version' into release-3.13Brad King2018-11-191-3/+19
|\ \
| * | IRSL: Detect versioned Windows Universal CRT directoriesBrad King2018-11-191-3/+19
| |/
* | Merge branch 'backport-configure_file-canonical-deps' into release-3.13Brad King2018-11-195-11/+18
|\ \
| * | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-195-11/+18
| |/
* | Merge branch 'ctest-stdin' into release-3.13Brad King2018-11-157-2/+45
|\ \
| * | CTest: Restore inheritance of stdin by test processesBrad King2018-11-156-2/+36
| * | Tests: Teach RunCMake infrastructure to optionally provide stdinBrad King2018-11-151-0/+9
| |/
* | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-11-132-5/+5
|\ \
| * | FindBoost: Additional fixes for 1.69Roger Leigh2018-11-132-5/+5
| |/
* | Merge branch 'FindBoost-compiler-guess-update' into release-3.13Brad King2018-11-091-7/+26
|\ \
| * | FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+Mateusz Łoskot2018-11-091-7/+26
* | | Merge branch 'asm-compiler-id-clang' into release-3.13Brad King2018-11-091-0/+8
|\ \ \ | |/ / |/| |
| * | ASM: Detect compiler id for Clang used as AssemblerBrad King2018-11-091-0/+8
| |/
* | Merge branch 'FindBoost-link-threads' into release-3.13Brad King2018-11-091-0/+3
|\ \ | |/ |/|
| * FindBoost: Add system thread library to Boost_LIBRARIESFelix Geyer2018-11-091-0/+3
|/
* CMake 3.13.0-rc3v3.13.0-rc3Brad King2018-11-071-1/+1
* Merge branch 'FindOpenMP-log-errors' into release-3.13Brad King2018-11-071-3/+10
|\