summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-autogen-qt-version-from-dirprops' into release-3.13Brad King2019-01-307-1/+84
|\ | | | | | | Merge-request: !2883
| * AutoGen: query Qt5 version from directory propertiesBen Boeckel2019-01-301-0/+12
| | | | | | | | | | | | | | This allows functions which enable AutoGen to make the version variables available at generate time. See: #18732
| * Tests: add cases for providing Qt5Core_VERSION manuallyBen Boeckel2019-01-306-1/+72
| |
* | Merge branch 'backport-restore-install-late-framework' into release-3.13Brad King2019-01-293-2/+30
|\ \ | | | | | | | | | Merge-request: !2878
| * | macOS: Restore compatibility for setting FRAMEWORK after install()Brad King2019-01-293-2/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FRAMEWORK` target property affects the way the `install()` command treats the target and so should be set first. Our implementation assumed that this was always the case and led to an assertion failure. Prior to CMake 3.12 this was visible only when using an explicit `LIBRARY ... NAMELINK_ONLY` option, but commit 0212d7c762 (install: add NAMELINK_COMPONENT argument, 2018-04-18, v3.12.0-rc1~139^2~3) made it possible with a simple `LIBRARY DESTINATION`. Fully supporting out-of-order specification will require non-trivial refactoring to defer install generator creation to generate time. For now simply restore the old behavior of installing the framework to the library destination. Fixes: #18848
* | Merge branch 'add-missing-macos-framework' into release-3.13Brad King2019-01-291-1/+2
|\ \ | | | | | | | | | Merge-request: !2873
| * | macOS: Add missing explicit dependency on CoreServices frameworkChuck Atkins2019-01-291-1/+2
| |/ | | | | | | | | | | | | | | On Apple, the implementation of cmGlobalXCodeGenerator::Open uses LSOpenCFURLRef from CoreServices. This get's transitively pulled in from CMake's libuv build but ends up generating a linker error when using an external libuv. This explicitly adds the appropriate dependency.
* | Merge branch 'doxygen-escaping' into release-3.13Brad King2019-01-281-1/+3
|\ \ | | | | | | | | | Merge-request: !2867
| * | FindDoxygen: Escape backslashes in default valuesCraig Scott2019-01-261-1/+3
| |/ | | | | | | | | | | | | Doxygen 1.8.15 added a new LATEX_MAKEINDEX_CMD config item and it has a default value that contains a backslash on some installations. Fixes: #18738
* | Merge branch 'intel-compile-features' into release-3.13Brad King2019-01-251-1/+1
|\ \ | | | | | | | | | Merge-request: !2862
| * | Intel: Record support for relaxed constexpr by version 18.0.5Brad King2019-01-251-1/+1
| |/ | | | | | | | | | | Update the special case added by commit f719a13c28 (Features: Add special case to disable relaxed constexpr for Intel 18, 2018-06-04, v3.12.0-rc1~11^2) to record that 18.0.5 fixed the regression.
* | Merge branch 'revert-file-alt-httpauth' into release-3.13Brad King2019-01-241-8/+0
|\ \ | | | | | | | | | Merge-request: !2858
| * | Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"Brad King2019-01-241-8/+0
| |/ | | | | | | | | | | | | | | Revert commit 31301b46a7 (file: Allow DOWNLOAD/UPLOAD using alternate authentication methods, 2018-08-28, v3.13.0-rc1~155^2). It regressed support for password-protected redirects. Fixes: #18691
* | Merge branch 'backport-cmake-warn-no-src-build-dir' into release-3.13Brad King2019-01-225-5/+46
|\ \ | |/ |/| | | Merge-request: !2839
| * Help: Add 3.13.4 release note for no source/build dir error/warningCraig Scott2019-01-221-0/+26
| |
| * cmake: Convert no source/build dir error to warningCraig Scott2019-01-224-5/+20
|/ | | | | | | | | | Temporarily restore previous behavior that allowed specifying no source or build directory to work, even though it was neither documented nor supported. This commit is expected to eventually be reverted to restore the fatal error for such cases. Relates: #18817
* CMake 3.13.3v3.13.3Brad King2019-01-141-1/+1
|
* Merge branch 'cmake-option-parsing' into release-3.13Brad King2019-01-146-30/+39
|\ | | | | | | Merge-request: !2799
| * cmake: Ensure source and binary dirs are setCraig Scott2019-01-135-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | If only the source dir is provided, the binary dir is assumed to be the working directory. If only the binary dir is provided and it doesn't yet have a CMakeCache.txt to provide the source dir, then the source dir is assumed to be the working directory. This logic was not previously being handled correctly when -S and/or -B options were involved. Furthermore, when both were missing, no suitable error message was provided and an empty string was used for the build directory. Fixes: #18707
| * cmake: Stop processing if -P option lacks file nameCraig Scott2019-01-131-5/+5
| | | | | | | | | | | | | | While an error message was being logged, processing was continuing nonetheless except with the -P argument omitted. This could have allowed unintended effects if the remaining arguments formed a valid set of command line options.
* | 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
generated by cgit v0.12 at 2025-01-10 21:41:28 (GMT)