summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Fix regression in dependencies on relative includesBrad King2019-07-247-4/+47
| | | | | | | | | | | | | | Since commit a13a5c948e (Replace use of CollapseCombinedPath with CollapseFullPath, 2019-03-19, v3.15.0-rc1~361^2~1), one code path now calls `CollapseFullPath` with a base path that may be relative. Backport KWSys commit c6f8e24a3 (SystemTools: Fix CollapseFullPath with relative base path, 2019-07-24) to handle such base paths. This case occurs when a build tree is placed in a directory inside a source tree such that CMake is willing to generate a relative path from the build tree to the source tree. Add a test covering this case. Fixes: #19507
* CMake 3.15.0v3.15.0Brad King2019-07-171-1/+1
|
* Merge branch 'find_package-fix-NO_MODULE' into release-3.15Brad King2019-07-164-2/+38
|\ | | | | | | Merge-request: !3557
| * find_package: Fix NO_MODULE under CMAKE_FIND_PACKAGE_PREFER_CONFIGCristian Adam2019-07-164-2/+38
| | | | | | | | | | | | | | | | | | | | | | The module mode fallback added by commit 22e65d10c1 (find_package: Fixed CMAKE_FIND_PACKAGE_PREFER_CONFIG Module fallback, 2019-06-13, v3.15.0-rc2~6^2) should not be used unless the `find_package` call allows module mode. Doing so can lead to infinite recursion if a find module tries to call config mode with `find_package(... NO_MODULE)`. Fix the logic and add a test case. Fixes: #19478
* | Merge branch 'FindBISON-CMP0088-SourcePath' into release-3.15Brad King2019-07-122-3/+17
|\ \ | | | | | | | | | Merge-request: !3549
| * | FindBISON: Fix CMP0088 NEW behavior for non-absolute input pathsBrian Carlson2019-07-122-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | Now that the working directory is in the build tree, relative input paths must be converted to an absolute path to remain relative to the source directory. Fixes: #19472
* | | Merge branch 'object-library-sbcs' into release-3.15Brad King2019-07-121-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !3537
| * | | VS: Fix SBCS support for object librariesBrad King2019-07-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | In commit 3a53005f7d (Build object library targets in VS, 2012-03-12, v2.8.8~29^2~13) we updated the condition for unicode but accidentally left out the SBCS case support for object libraries. Fixes: #19469
* | | Merge branch 'fortran-submodule-cray' into release-3.15Brad King2019-07-112-1/+9
|\ \ \ | |/ / |/| | | | | Merge-request: !3504
| * | Fortran: Add support for submodules on CrayWillem Deconinck2019-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Define `CMAKE_Fortran_SUBMODULE_{SEP,EXT}` for the Cray Fortran compiler. Use an empty separator to tell CMake that this compiler does not use the enclosing module name as a prefix on submodule files. Issue: #18925
| * | Fortran: Support compilers using no module prefix on submodule filesWillem Deconinck2019-07-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Define `CMAKE_Fortran_SUBMODULE_SEP` with an empty string to mean that the compiler uses no module prefix on its submodule files. Also add a default fallback to use the `.mod` extension when `CMAKE_Fortran_SUBMODULE_EXT` is not set. This is a better guess than no extension at all.
* | | CMake 3.15.0-rc4v3.15.0-rc4Brad King2019-07-101-1/+1
| | |
* | | Merge branch 'implicit-includes-cray-hlist' into release-3.15Brad King2019-07-108-2/+167
|\ \ \ | | | | | | | | | | | | Merge-request: !3532
| * \ \ Merge branch 'backport-implicit-includes-cray-hlist'Brad King2019-07-098-2/+167
| |\ \ \
| | * | | Cray: Fix include parsing when the -hlist= flag is presentChuck Atkins2019-07-098-2/+167
| | | |/ | | |/| | | | | | | | | | | | | | | | | Update parsing logic from commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) to handle the quoting behavior caused by the `-hlist=` flag.
* | | | Merge branch 'cuda-imported-library-device-linking' into release-3.15Brad King2019-07-101-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3526
| * | | | CUDA: Restore device linking to imported static library targetsRobert Maynard2019-07-091-6/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This ability was lost in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) and needs to be restored to use imported static libraries that have CUDA symbols.
* | | | Merge topic 'docs-message-cmake-gui' into release-3.15Craig Scott2019-07-101-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3523
| * | | | message() help: Clarify how logs are displayed in various toolsFrank Dana2019-07-091-6/+6
|/ / / /
* | | | Merge branch 'ccmake-clear-aliases' into release-3.15Brad King2019-07-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3529
| * | | | cmGlobalGenerator: Do not persist alias targets across configuresBrad King2019-07-081-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `ccmake` a single global generator instance may be used for multiple configure step runs. The `cmGlobalGenerator::ClearGeneratorMembers` method is supposed to clear global state that is specific to each configure run but forgot to clear alias targets. Fixes: #19457
* | | | Merge branch 'iar-riscv' into release-3.15Brad King2019-07-097-3/+20
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3510
| * | | | IAR: Add support for the RISC-V compilerStefan Andersson2019-07-087-3/+20
| |/ / /
* | | | Merge branch 'loglevel-option-case-consistency' into release-3.15Craig Scott2019-07-092-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3521
| * | | | Help: Use consistent levels for cmake --loglevel and message()Craig Scott2019-07-082-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message() command requires uppercase log levels. Even though the cmake --loglevel option is not case sensitive, show the supported values as uppercase to match the message() docs as closely as possible, since they are related to the same feature. Also fixes the wrong string being shown for the warning level by cmake --help.
* | | | Merge branch 'docs-misc-trivial-cleanups' into release-3.15Craig Scott2019-07-045-39/+39
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3498
| * | | | Help: Remove mention of CMAKE_INSTALL_DO_STRIPCraig Scott2019-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't yet clear whether we want to make this part of the documented API for the install script. Remove it from the docs before it appears in an official release for now. Relates: #18997
| * | | | Help: Clarify how to provide multiple targets with cmake --targetCraig Scott2019-07-031-1/+2
| | | | |
| * | | | Help: Add missing xref for CMAKE_EXECUTE_PROCESS_COMMAND_ECHOCraig Scott2019-07-031-0/+2
| | | | |
| * | | | Help: Improve formatting of list(TRANSFORM) sub-optionsCraig Scott2019-07-031-17/+17
| | | | |
| * | | | Help: Clean up trivial typos and grammarCraig Scott2019-07-035-20/+17
| |/ / /
* | | | Merge branch 'FindPostgreSQL-lib-dir' into release-3.15Brad King2019-07-031-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3505
| * | | | FindPostgreSQL: Fix regression in computation of library directoryBrad King2019-07-021-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 368bcba28a (FindPostgreSQL: Find debug lib, imported configs, 2019-05-09, v3.15.0-rc1~93^2) the `PostgreSQL_LIBRARY` variable may contain a list and therefore should not be passed to the `get_filename_component` command directly. Instead spell out the logic to compute `PostgreSQL_LIBRARY_DIR` from one of the per-configuration variables. Fixes: #19444
* | | | Merge topic 'doc-toolchain-file-CMAKE_SOURCE_DIR' into release-3.15Craig Scott2019-07-031-0/+8
|\ \ \ \ | |_|/ / |/| | | | | | | Merge-request: !3495
| * | | Help: Discourage using CMAKE_SOURCE_DIR in toolchain filesOleg Chernovskiy2019-07-021-0/+8
|/ / / | | | | | | | | | Fixes: #19390
* | | Merge branch 'qt-5.13' into release-3.15Brad King2019-07-012-5/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !3500
| * | | QtDialog: Use QPalette::WindowText instead of QPalette::ForegroundSebastian Holtermann2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `QPalette::Foreground` is deprecated and was replaced by `QPalette::WindowText` since at least Qt 4.8. https://doc.qt.io/archives/qt-4.8/qpalette.html#ColorRole-enum This replaces the `QPalette::Foreground` color role with `QPalette::WindowText` in `QtDialog/RegexExplorer.cxx` to avoid compiler warnings.
| * | | Tests: Autogen: Use valid rcc compression levelsSebastian Holtermann2019-07-011-4/+4
| |/ / | | | | | | | | | | | | Avoid the invalid compression level 0 when invoking rcc. It let's rcc fail with an error since Qt 5.13.
* | | Merge branch 'update-expat' into release-3.15Brad King2019-07-0124-1570/+2056
|\ \ \ | | | | | | | | | | | | Merge-request: !3501
| * \ \ Merge branch 'upstream-expat' into update-expatBrad King2019-07-0123-1569/+2055
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2019-06-19 (d3b78b42)
| | * | | expat 2019-06-19 (d3b78b42)Expat Upstream2019-07-0123-1569/+2055
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit d3b78b42a2dcdea98e22625cfff67a49d47e6025 (R_2_2_7).
| * | | | expat: Update script to get Expat 2.2.7Brad King2019-07-011-1/+1
| | |/ / | |/| |
* | | | Merge branch 'cuda-no-device-link-when-disabled' into release-3.15Brad King2019-07-018-11/+38
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3491
| * | | | CUDA: Do not device link if CUDA is not an enabled languageRobert Maynard2019-07-018-11/+38
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks added in commit 81b4d10d8f (CUDA: More exhaustive checks to determine when to do device linking, 2019-05-09, v3.15.0-rc1~82^2) assumed that CUDA properties would be set only if CUDA is enabled. We cannot do a device link step if we do not have the CUDA language enabled. This was discovered as some projects unconditionally set CUDA properties such as `CUDA_RESOLVE_DEVICE_SYMBOLS` even when the CUDA language has not been enabled. Fixes: #19432
* | | | Merge branch 'docs-project-code-injection' into release-3.15Craig Scott2019-07-011-13/+18
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3494
| * | | | Help: move code injection vars to their own sectionCraig Scott2019-06-301-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | The docs for CMAKE_PROJECT_<projName>_INCLUDE and CMAKE_PROJECT_INCLUDE did not define the order of inclusion if both were set.
| * | | | Help: Remove self-references from project() docsCraig Scott2019-06-291-5/+5
| |/ / /
* | | | Merge branch 'bug/19436' into release-3.15Craig Scott2019-07-012-1/+14
|\ \ \ \ | |/ / / |/| | | | | | | Merge-request: !3497
| * | | list(POP_FRONT): Fix always assigning first item to output varsAlex Turbov2019-06-302-1/+14
|/ / / | | | | | | | | | Fixes: #19436
* | | CMake 3.15.0-rc3v3.15.0-rc3Brad King2019-06-271-1/+1
| | |
generated by cgit v0.12 at 2025-01-01 10:59:23 (GMT)