summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2022-08-081-1/+1
|
* CMake Nightly Date StampKitware Robot2022-08-071-1/+1
|
* CMake Nightly Date StampKitware Robot2022-08-061-1/+1
|
* Merge topic 'string-JSON-error-typo'Brad King2022-08-052-4/+4
|\ | | | | | | | | | | | | e0d3e6e147 string(JSON): Fix typo in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7547
| * string(JSON): Fix typo in error messageSean Kahler2022-08-042-4/+4
| | | | | | | | `s/then/than/` in a comparison.
* | Merge topic 'swift_debug'Brad King2022-08-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 20fe9cf7e9 Swift: Disable optimization when compiling in Debug Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7545
| * | Swift: Disable optimization when compiling in DebugDavid Geldreich2022-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default no `-O...` flag is specified for Debug configuration for Swift so Xcode adds a (wrong) `-O` flag that prevents one from accessing variables while debugging. Add `-Onone` to the Swift Debug configuration to avoid this. Fixes: #23818
* | | Merge topic 'find_package-one-more-path'Brad King2022-08-056-4/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19366408fe cmFindPackageCommand: Protect overrides of `cmDirectoryListGenerator` e55c154c5b cmFindPackageCommand: Add one more search path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7542
| * | | cmFindPackageCommand: Protect overrides of `cmDirectoryListGenerator`Alex Turbov2022-08-041-0/+2
| | | | | | | | | | | | | | | | Move virtual function overrides into a protected section of class.
| * | | cmFindPackageCommand: Add one more search pathAlex Turbov2022-08-046-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | The `PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/(Foo|foo|FOO).*/` search path is the similar to the one already exists `PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/`.
* | | | CMake Nightly Date StampKitware Robot2022-08-051-1/+1
| |_|/ |/| |
* | | Merge branch 'release-3.24'Brad King2022-08-040-0/+0
|\ \ \
| * | | CMake 3.24.0v3.24.0Brad King2022-08-041-1/+1
| | | |
* | | | Merge topic 'doc-CPACK_NUGET_PACKAGE_REQUIRE_LICENSE_ACCEPTANCE'Brad King2022-08-041-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02621e66d0 Help: Add CPACK_NUGET_PACKAGE_REQUIRE_LICENSE_ACCEPTANCE docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7541
| * | | | Help: Add CPACK_NUGET_PACKAGE_REQUIRE_LICENSE_ACCEPTANCE docsAlex Turbov2022-08-031-0/+8
| | |/ / | |/| | | | | | | | | | This variable has existed since the initial NuGet support was added but has not been documented.
* | | | Merge topic 'cmake-preset-error-reporting'Brad King2022-08-048-20/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47929ee98c presets: Add basic error forwarding from cmake preset json parser Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7495
| * | | | presets: Add basic error forwarding from cmake preset json parserSankhesh Jhaveri2022-08-038-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | Print errors only if there are errors. Add filename for better introspection, particularly for FileNotFound errors with presets.
* | | | | Merge topic 'enable-intel-llvm-ipo-3'Brad King2022-08-047-43/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c633bd76d8 Add linker prefix for "-stack" flag on MSVC builds 6823db0c5a Enable IPO for IntelLLVM compilers on Linux and Windows adbffd204d Propagate OpenMP compiler flags to linker for IntelLLVM 3640842df2 Tests: Update ModuleDefinition for IntelLLVM MSVC Frontend Variant 5d5a712303 IntelLLVM: Pass linker flags to the compiler when used as linker Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7533
| * | | | | Add linker prefix for "-stack" flag on MSVC buildsWilliam R. Dieter2022-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
| * | | | | Enable IPO for IntelLLVM compilers on Linux and WindowsWilliam R. Dieter2022-08-013-32/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replicate and adapt Linux IPO options for Intel for IntelLLVM compilers on Linux and Windows. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
| * | | | | Propagate OpenMP compiler flags to linker for IntelLLVMWilliam R. Dieter2022-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling for offload and in general when OpenMP is enabled while compiling, it should also be enabled when linking. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
| * | | | | Tests: Update ModuleDefinition for IntelLLVM MSVC Frontend VariantWilliam R. Dieter2022-08-011-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntelLLVM for MSVC uses the compiler for linking. The /DEF flag needs to be passed to the linker, and the compiler does not accept it, unless it is prefixed with `/Qoption,link,`. Rather than explicitly set the LINK_FLAGS target property, as is done for other MSVC frontend variants, add the .def file to the sources for `add_library`. `add_library` will wrap the `/DEF` flag using `CMAKE_${lang}_LINKER_WRAPPER_FLAG`. Presumably, this should work for any MSVC front end, but leave the original test to avoid changing a test that is working. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
| * | | | | IntelLLVM: Pass linker flags to the compiler when used as linkerWilliam R. Dieter2022-08-011-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When linking an executable, DLL, or static library, the compiler sometimes needs to see the linking options. Typically `<FLAGS>` is not passed for linking, because some of the options are only used for compilation. Previously, `<LINK_FLAGS>` was passed after the `/link` flag because the compiler did not understand some of the linking options. This change wraps the initial linker options borrowed from Windows-MSVC individually, so that they are passed directly to the linker. This change is helpful both for interprocedural optimization, which needs to pass `-Qipo` to the compiler at link time, and for SYCL which needs to pass `-fsycl` and possibly other options to the compiler at link time. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | Merge branch 'release-3.24'Brad King2022-08-040-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'makefile-path-consistency' into release-3.24Brad King2022-08-044-34/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e0b06fe84 Makefiles: Restore path consistency in the global dispatch makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7543
* | \ \ \ \ \ Merge topic 'makefile-path-consistency'Brad King2022-08-044-34/+48
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e0b06fe84 Makefiles: Restore path consistency in the global dispatch makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7543
| * | | | | | Makefiles: Restore path consistency in the global dispatch makefileBrad King2022-08-034-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory-level rules in `CMakeFiles/Makefile2` were previously previously written by each directory's local generator using its own decision for using relative or absolute paths. Since commit d33b12d84b (Add support for build tree symlink inside source tree, 2022-02-25, v3.24.0-rc1~583^2), each local generator explicitly models the relationship between its source and build paths, and uses this to determine when it is safe to use relative paths. Because `add_subdirectory` supports arbitrary placement of the source and build directories, different local generators may have different relationships between their source and build paths. This can cause disagreement among rules written to `CMakeFiles/Makefile2`. Restore consistency by always using the root local generator to write rules to `CMakeFiles/Makefile2`. Relative paths should always be expressed w.r.t. the top-level build directory since that is the working directory in which the `make` tool processing the file will run. Fixes: #23814
* | | | | | | Merge branch 'release-3.24'Brad King2022-08-040-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'fetchcontent-set-CMAKE_VERIFY_INTERFACE_HEADER_SETS' into ↵Brad King2022-08-047-1/+81
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.24 2a9cc3e8e8 FetchContent: Disable header set verification for dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7535
* | \ \ \ \ \ \ Merge topic 'fetchcontent-set-CMAKE_VERIFY_INTERFACE_HEADER_SETS'Brad King2022-08-047-1/+81
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9cc3e8e8 FetchContent: Disable header set verification for dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7535
| * | | | | | | FetchContent: Disable header set verification for dependenciesCraig Scott2022-08-037-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_VERIFY_INTERFACE_HEADER_SETS variable is intended to be under the control of the user. It doesn't discriminate between header sets defined in the main project and those defined by dependencies brought into the build directly via FetchContent. Developers will usually only be interested in verifying the main project's header sets, not those from dependencies. Make the variable effectively only enable header set verification of the main project by turning it off during FetchContent_MakeAvailable() calls. The user still has variables like CMAKE_PROJECT_INCLUDE and CMAKE_PROJECT_<projectName>_INCLUDE available to them if they want to enable verification of all or specific dependencies respectively. Fixes: #23808
* | | | | | | | Merge branch 'release-3.24'Brad King2022-08-040-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-find_package-typo' into release-3.24Brad King2022-08-041-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5635d33656 Help: Fix reST syntax typo in find_package docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7540
* | \ \ \ \ \ \ \ Merge topic 'doc-find_package-typo'Brad King2022-08-041-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5635d33656 Help: Fix reST syntax typo in find_package docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7540
| * | | | | | | | Help: Fix reST syntax typo in find_package docsEisuke Kawashima2022-08-031-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.24'Brad King2022-08-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindLua-docfmt' into release-3.24Brad King2022-08-041-13/+16
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e2094fb9b FindLua: Improve documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7539
* | | | | | | | | Merge topic 'FindLua-docfmt'Brad King2022-08-041-13/+16
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 3e2094fb9b FindLua: Improve documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7539
| * | | | | | | FindLua: Improve documentation formattingMichael Hirsch2022-08-031-13/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cb811d11ce (Help: Improve description of modules, 2019-04-12, v3.15.0-rc1~210^2) we've had two `::` prompts for the preformatted block listing the result variables. Convert the block to a definition list.
* | | | | | | CMake Nightly Date StampKitware Robot2022-08-041-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.24'Kyle Edwards2022-08-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'all-verify-interface-header-sets' into release-3.24Kyle Edwards2022-08-0310-0/+58
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 83e44002ae VERIFY_INTERFACE_HEADER_SETS: Add verification target for all Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7536
* | | | | | Merge topic 'all-verify-interface-header-sets'Kyle Edwards2022-08-0310-0/+58
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 83e44002ae VERIFY_INTERFACE_HEADER_SETS: Add verification target for all Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7536
| * | | | | VERIFY_INTERFACE_HEADER_SETS: Add verification target for allKyle Edwards2022-08-0310-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23802
* | | | | | Merge topic 'try_compile-cleanup'Brad King2022-08-0339-544/+526
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b427d8da9 cmCoreTryCompile: Port to cmArgumentParser 067ba3a2bd cmCoreTryCompile: Move target type selection logic to try_compile 781e1b191a cmCoreTryCompile: Simplify TryCompileCode return type 3218ea60de Tests: Add RunCMake.try_compile case for try_run-only args b8e551ed32 Tests: Add RunCMake.try_run cases for missing keyword arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7531
| * | | | | | cmCoreTryCompile: Port to cmArgumentParserBrad King2022-08-0221-581/+430
| | | | | | |
| * | | | | | cmCoreTryCompile: Move target type selection logic to try_compileBrad King2022-08-024-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is specific to `try_compile` since `try_run` always needs an executable. Move the logic out of the common code path.
| * | | | | | cmCoreTryCompile: Simplify TryCompileCode return typeBrad King2022-08-023-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value is only used as a boolean, so use `bool`.
| * | | | | | Tests: Add RunCMake.try_compile case for try_run-only argsBrad King2022-08-023-0/+83
| | | | | | |
| * | | | | | Tests: Add RunCMake.try_run cases for missing keyword argumentsBrad King2022-08-0123-13/+58
| | | | | | |