summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-autogen_noqt_warning' into release-3.13Brad King2019-01-117-0/+46
|\ | | | | | | Merge-request: !2787
| * 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
|/ | | | | | | | We used to silently disable AUTOMOC/UIC/RCC when no valid Qt version was found. This patch introduces the generation of a warning message in that case. Closes #18732.
* Merge branch 'cmake-CDU-option-parsing' into release-3.13Brad King2019-01-1013-1/+37
|\ | | | | | | Merge-request: !2783
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | This results in the correct source directory being picked up in calls with cmake sourcedir -C settings and in a more appropriate error message when calling mkdir build ; cd build ; cmake -C settings Also fix `-D` and `-U` in the same way.
* | Merge branch 'feature/fix-link_resolved_item_into_bundle' into release-3.13Craig Scott2019-01-091-0/+3
|\ \ | | | | | | Merge-request: !2728
| * | BundleUtilities: Ensure target dir exists when creating symlinksTim Blechmann2019-01-081-0/+3
| |/ | | | | | | | | | | | | | | | | | | Commit v3.13.0-rc1~279^2 (GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle, 2018-07-22) introduced a regression that can cause symlink creation to fail during packaging. Symlinks can be created before targets are installed, so the destination directory of the symlink sometimes won't exist at symlink creation. Fixes: #18726
* | Merge branch 'vs2017-skip-2019' into release-3.13Brad King2019-01-081-0/+9
|\ \ | |/ |/| | | Merge-request: !2775
| * VS: Exclude VS 2019 instances when using VS 2017 generatorBrad King2019-01-081-0/+9
|/ | | | | | | Filter instances reported by the VS Installer to consider only VS 2017 instances for the "Visual Studio 15 2017" generator. Fixes: #18721
* 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
|\ | | | | | | Merge-request: !2724
| * 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
|\ \ | | | | | | | | | Merge-request: !2709
| * | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-073-6/+24
| |/ | | | | | | | | | | | | | | | | Passing an incomplete list of compiler include directories causes a regression in the KIO project (and probably others). We need to disable it until the complete list is available (see #16291). Fixes: #18669 Issue: #18041
* | Merge branch 'cpack-status-callback' into release-3.13Brad King2018-12-073-0/+13
|\ \ | | | | | | | | | Merge-request: !2696
| * | CPack/External: Fix status messages of staging scriptsNils Gladitz2018-12-073-0/+13
| |/ | | | | | | | | | | | | | | Set progress callback on cmake instance used by CPack. The progress callback is used to output STATUS messages which are otherwise missing when issued from e.g. CPack External staging scripts. Fixes: #18567
* | Merge branch 'cuda-external' into release-3.13Brad King2018-12-056-1/+20
|\ \ | |/ |/| | | Merge-request: !2704
| * CUDA: Fix crash on linking to a CUDA target without CUDA enabledBrad King2018-12-056-1/+20
|/ | | | | | | | Do not try to device link or add CUDA runtime libraries if the language is not enabled. Fixes: #18673 Issue: #18614
* 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
|\ | | | | | | Merge-request: !2667
| * Autogen: Fix empty uic executable stringSebastian Holtermann2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't link against Qt5Widgets, the uic executable string is empty and an error string "The uic executable \"\" does not exist" is generated. In CMake 3.12 ``AUTOUIC`` was silently disabled instead. This patch fixes the regression and restores the behavior of CMake 3.12. Fixes: #18630
* | Merge branch 'vs2015-no-sdk' into release-3.13Brad King2018-11-261-17/+21
|\ \ | | | | | | | | | Merge-request: !2656
| * | VS: Avoid crash with VS 2015 when all SDKs are higher than 10.0.14393.0Harry Mallon2018-11-261-17/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | Move the filter added by commit v3.13.0-rc1~72^2~2 (VS: Do not select a Windows SDK too high for current VS version, 2017-08-07, committed 2018-09-17) to before our check that the remaining list is empty. Otherwise we crash when dereferencing the first entry of an empty vector. Also add a comment explaining where 10.0.14393.0 came from. Fixes: #18633
* | Merge branch 'FindBoost-no-cxx' into release-3.13Brad King2018-11-264-6/+6
|\ \ | | | | | | | | | Merge-request: !2663
| * | FindBoost: Restore finding without CXX language enabledBrad King2018-11-264-6/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit v3.13.0~7^2 (FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+, 2018-11-07) we run the internal `_Boost_COMPILER_DUMPVERSION` macro on all UNIX platforms. Teach the macro to tolerate missing `CMAKE_CXX_COMPILER_VERSION`, which occurs when the CXX language is not enabled. Fixes: #18624
* | Merge branch 'fortran-submodule-case' into release-3.13Brad King2018-11-203-117/+117
|\ \ | |/ |/| | | Merge-request: !2644
| * Fortran: Fix module dependency scanning with upper-case SUBMODULEBrad King2018-11-203-117/+117
|/ | | | | | | | The lexical token expression added by commit v3.7.0-rc1~73^2~1 (Fortran: Add support for submodule syntax in dependency scanning, 2016-09-05) has a typo and does not match upper-case `B` in `SUBMODULE`. Fix it. Fixes: #18595
* CMake 3.13.0v3.13.0Brad King2018-11-201-1/+1
|
* Merge branch 'blas-pkgcfg' into release-3.13Brad King2018-11-191-0/+1
|\ | | | | | | Merge-request: !2631
| * FindBLAS: Restore BLAS_FOUND when found using pkgconfigMartin von Gagern2018-11-191-0/+1
| | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~92^2 (FindPkgConfig: export the list of found libraries also as variable, 2018-05-11) dropped use of FPHSA to set `BLAS_FOUND`. Set it explicitly instead.
* | Merge branch 'FindPython-lib-arch' into release-3.13Brad King2018-11-191-0/+17
|\ \ | | | | | | | | | Merge-request: !2624
| * | 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
|\ \ | | | | | | | | | Merge-request: !2637
| * | IRSL: Detect versioned Windows Universal CRT directoriesBrad King2018-11-191-3/+19
| |/ | | | | | | | | | | | | Windows SDK version 10.0.17763.0 now places the uCRT libraries in a versioned directory. Fixes: #18603
* | Merge branch 'backport-configure_file-canonical-deps' into release-3.13Brad King2018-11-195-11/+18
|\ \ | | | | | | | | | Merge-request: !2635
| * | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-195-11/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | Merge branch 'ctest-stdin' into release-3.13Brad King2018-11-157-2/+45
|\ \ | | | | | | | | | Merge-request: !2618
| * | CTest: Restore inheritance of stdin by test processesBrad King2018-11-156-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10) we do not give the child test processes any stdin. Prior to that change we let the child test processes inherit stdin from ctest itself. Tests that run serially might be able to use the real stdin meaningfully, so restore that behavior and add a test case. Fixes: #18591
| * | 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
|\ \ | | | | | | | | | Merge-request: !2601
| * | 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
|\ \ | | | | | | | | | Merge-request: !2579
| * | FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+Mateusz Łoskot2018-11-091-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add recognition of compiler version and prefix for clang. Accommodate changes to version numbering scheme for GCC 5+ and clang 4+ - Minor number becomes patch, so excluded it from compiler prefix. - Improves searching for Boost 1.69+ libraries built with GCC 5+ and clang 4+, where library names are generated with compiler tag based on major version only eg. -gcc5 for GC 5.5.0 or -clang6 for clang 6.0.0 - Follows up related changes in upcoming Boost 1.69 https://github.com/boostorg/build/pull/349 Dump detected compiler version in Boost_DEBUG message. Replace use of CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID.
* | | Merge branch 'asm-compiler-id-clang' into release-3.13Brad King2018-11-091-0/+8
|\ \ \ | |/ / |/| | | | | Merge-request: !2584
| * | ASM: Detect compiler id for Clang used as AssemblerBrad King2018-11-091-0/+8
| |/ | | | | | | | | | | | | | | | | | | Add missing vendor table entries for Clang and AppleClang to identify them. Previously this worked only if Clang was also enabled as a C or CXX compiler first because we used to copy the C compiler id. However, that was removed by commit v3.13.0-rc1~44^2 (ASM: Search for full path even when using C or C++ compiler, 2018-09-26). Fixes: #18575
* | Merge branch 'FindBoost-link-threads' into release-3.13Brad King2018-11-091-0/+3
|\ \ | |/ |/| | | Merge-request: !2570
| * FindBoost: Add system thread library to Boost_LIBRARIESFelix Geyer2018-11-091-0/+3
|/ | | | | | | | | Add the system thread library to Boost_LIBRARIES when the boost thread component has been found. The Boost::thread imported target already pulls in Threads::Threads. This changes does the same for projects using the Boost_LIBRARIES variable instead.
* 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
|\ | | | | | | Merge-request: !2574
generated by cgit v0.12 at 2025-01-11 10:49:26 (GMT)