summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindPkgConfig: Allow to override variables when calling pkg_get_variableCorentin Noël2023-09-194-2/+48
| | | | | This is specifically useful when building applications within containers as we sometimes need to redefine the prefix used in a variable.
* CMake Nightly Date StampKitware Robot2023-09-171-1/+1
|
* CMake Nightly Date StampKitware Robot2023-09-161-1/+1
|
* Merge topic 'find-windows-no-PATH-prefixes'Brad King2023-09-1534-194/+35
|\ | | | | | | | | | | | | | | 0a81110b84 find_(library|file|path): Drop PATH-derived search prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8802
| * find_(library|file|path): Drop PATH-derived search prefixesBrad King2023-09-1434-194/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ffc06c1239 (Teach find_(library|file|path) to get prefixes from PATH, 2015-02-18, v3.3.0-rc1~430^2) we search in `<prefix>/include` and `<prefix>/lib` directories for prefixes with `bin` directories in the `PATH` environment variable. The motivation was to search the installation prefixes of MSYS and MinGW development environments automatically. This behavior can search undesired prefixes that happen to be in the `PATH` for unrelated reasons. It was reverted for non-Windows hosts within a year by commit b30b32a493 (Drop find_(library|file|path) prefixes from PATH on non-Windows, 2016-05-09, v3.6.0-rc1~82^2) but was kept on Windows hosts to support its motivating use case. However, similar problems have since been observed on Windows. For example, commit 955d6245c1 (MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention", 2022-11-28, v3.25.1~6^2) was primarily due to undesired discovery of libraries in `PATH`-derived prefixes. Since commit 5e5132e1b1 (MinGW: Search for packages in standard MSYSTEM environment prefixes, 2023-09-11) we search MSYS and MinGW environments' prefixes explicitly, so `PATH`-derived prefixes are no longer needed for the original motivating use case. Fixes: #24216
* | CMake Nightly Date StampKitware Robot2023-09-151-1/+1
|/
* Merge branch 'release-3.27'Brad King2023-09-141-2/+2
|\
| * CMake 3.27.5v3.27.5Brad King2023-09-142-3/+3
| |
* | Merge branch 'release-3.27'Brad King2023-09-140-0/+0
|\ \ | |/
| * Merge topic 'cxxmodules-non-compiled-source' into release-3.27Brad King2023-09-148-4/+61
| |\ | | | | | | | | | | | | | | | | | | | | | 458e3974a8 cxxmodules: detect and message about non-compiled sources Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8773
* | \ Merge topic 'cxxmodules-non-compiled-source'Brad King2023-09-148-4/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24a9b00f83 Merge branch 'cxxmodules-non-compiled-source-release' into cxxmodules-non-compiled-source 458e3974a8 cxxmodules: detect and message about non-compiled sources Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8773
| * \ \ Merge branch 'cxxmodules-non-compiled-source-release' into ↵Ben Boeckel2023-09-128-4/+61
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | cxxmodules-non-compiled-source * cxxmodules-non-compiled-source-release: cxxmodules: detect and message about non-compiled sources
| | * | cxxmodules: detect and message about non-compiled sourcesBen Boeckel2023-09-128-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously an internal error was raised which ended up causing an internal exception to be thrown. This is a typo situation that should fall into an explicit error. Fixes: #25207
* | | | Merge topic 'autogen-exe-per-config'Brad King2023-09-1433-215/+877
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e454314daa NinjaMultiConfig: Update tests for the new dependency change fddd0f0443 Autogen: AUTO*_EXECUTABLE: add support for per-config values 10b09647f2 RunCMake: Add RunCMake_TEST_EXPECT_RESULT cac2e029f0 cmQtAutoGenInitializer: Define CrossConfig variable d4889361f0 cmQtAutoGenInitializer: Reduce string copies 0bf49d5579 cmQtAutoGenInitializer: Remove no-op call 94c4c1cb28 cmQtAutoGenInitializer: Improve Const-Correctness 6d54c36859 Autogen: Fix typo ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8564
| * | | | NinjaMultiConfig: Update tests for the new dependency changeOrkun Tokdemir2023-09-133-22/+40
| | | | |
| * | | | Autogen: AUTO*_EXECUTABLE: add support for per-config valuesOrkun Tokdemir2023-09-1327-174/+819
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Per-config values were added to `AUTO*_EXECUTABLE`. * Dependency order was refactored for `cmake_autogen` and `cmake_autorcc` to avoid unnecessary rebuilds. * A new parameter was added for `cmake_autogen` and `cmake_autorcc` to specify the config name of the `auto*_executable` to be used. * The timestamp target was split into three targets for per-config to avoid redundant `mocs_compilation` builds. * Per-config `DEP_FILE_RULE_NAME` values were added to `AutogenInfo.json` for `CMAKE_CROSS_CONFIG` usage. * Some functions were refactored to avoid code duplication. Fixes: #20074
| * | | | RunCMake: Add RunCMake_TEST_EXPECT_RESULTOrkun Tokdemir2023-09-131-0/+2
| | | | |
| * | | | cmQtAutoGenInitializer: Define CrossConfig variableOrkun Tokdemir2023-09-132-5/+6
| | | | |
| * | | | cmQtAutoGenInitializer: Reduce string copiesOrkun Tokdemir2023-09-131-1/+1
| | | | |
| * | | | cmQtAutoGenInitializer: Remove no-op callOrkun Tokdemir2023-09-131-3/+0
| | | | |
| * | | | cmQtAutoGenInitializer: Improve Const-CorrectnessOrkun Tokdemir2023-09-131-3/+4
| | | | |
| * | | | Autogen: Fix typoOrkun Tokdemir2023-09-131-4/+4
| | | | |
| * | | | cmCustomCommandGenerator: Fix GetInternalDepfile on moved instanceOrkun Tokdemir2023-09-132-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the constructor captured `this` in a lambda used by the `GetInternalDepfile` method, but the pointer is invalidated when the instance moves.
* | | | | Merge topic 'curl-hsts'Brad King2023-09-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bc0252850 curl: Enable HTTP Strict-Transport-Security (HSTS) for build in CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8801
| * | | | | curl: Enable HTTP Strict-Transport-Security (HSTS) for build in CMakeBrad King2023-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream curl enabled this by default starting in curl 7.77. We merged that version of curl in commit cd40922edb (Merge branch 'upstream-curl' into update-curl, 2021-05-27, v3.21.0-rc1~120^2~2) but accidentally switched HSTS off in the build system. Enable it now.
* | | | | | Merge topic 'mingw-search-prefixes'Brad King2023-09-1420-4/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e5132e1b1 MinGW: Search for packages in standard MSYSTEM environment prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8796
| * | | | | | MinGW: Search for packages in standard MSYSTEM environment prefixesBrad King2023-09-1320-4/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSYS2 and similar MinGW/MSYS distributions define development environments with a `MSYSTEM` environment variable. Each such environment has a documented installation prefix for its packages, often provided by a `MSYSTEM_PREFIX` environment variable. Since commit 84a25fc263 (cmake_host_system_information: Add MSYSTEM_PREFIX query, 2023-09-08) we can look up this prefix. Add `$MSYSTEM_PREFIX/local` and `$MSYSTEM_PREFIX` to our system search prefixes when targeting MinGW under `MSYSTEM` environments. This is their equivalent to `/usr/local` and `/usr`, which we search by default on UNIX systems. Issue: #24216
* | | | | | | CMake Nightly Date StampKitware Robot2023-09-141-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'ninja-cc-local'Brad King2023-09-132-9/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f16ebf333 cmNinjaTargetGenerator: Reduce lifetime of custom command list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8800
| * | | | | | cmNinjaTargetGenerator: Reduce lifetime of custom command listBrad King2023-09-122-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2583eff6fe (ninja: Factor out custom command order-only depends, 2014-03-10, v3.1.0-rc1~559^2) we can store the list of custom commands in a local variable rather than a member.
* | | | | | | Merge topic 'orkun_21677_16_06_2023'Brad King2023-09-1317-58/+134
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09b650d000 Autogen: Move QtAutoMocDeps tests to RunCMake/Autogen ebc9e448b3 Autogen: Add depfile support for Makefiles e5358b9d8d RunCMake: Add RunCMake_TEST_NOT_EXPECT variables Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8570
| * | | | | | | Autogen: Move QtAutoMocDeps tests to RunCMake/AutogenOrkun Tokdemir2023-09-1115-52/+113
| | | | | | | |
| * | | | | | | Autogen: Add depfile support for MakefilesOrkun Tokdemir2023-09-111-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21677
| * | | | | | | RunCMake: Add RunCMake_TEST_NOT_EXPECT variablesOrkun Tokdemir2023-09-111-0/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'Findosg-doc'Brad King2023-09-1320-151/+276
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90c3357c67 Findosg*: Improve documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8798
| * | | | | | | Findosg*: Improve documentation formatting權少2023-09-1220-151/+276
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Add reST markup for inline literals, definition lists, and notes.
* | | | | | | Merge branch 'release-3.27'Brad King2023-09-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'automoc-macro-names' into release-3.27Brad King2023-09-131-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42adf3cba8 Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8799
* | \ \ \ \ \ \ Merge topic 'automoc-macro-names'Brad King2023-09-131-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 42adf3cba8 Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8799
| * | | | | | Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficientlyBrad King2023-09-121-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit c5c3aff1f5 (Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target property, 2023-04-03, v3.27.0-rc1~197^2) we forgot to mark the property as a usage requirement. This is needed for efficient evaluation over the target dependency closure. Fixes: #25238
* | | | | | CMake Nightly Date StampKitware Robot2023-09-131-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'presets-schema'Brad King2023-09-1213-34/+116
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1a7179520 presets: Add $schema property to JSON schema f83771dfce presets: Add missing spaces in JSON schema Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8777
| * | | | | presets: Add $schema property to JSON schemaChenMoFeiJin2023-09-1213-2/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many modern code editors have support for JSON Schema. When you specify the `$schema` property in a JSON file, the editor can provide features like auto-completion, error checking, etc., which can improve your efficiency when writing and modifying the `CMakePresets.json` file.
| * | | | | presets: Add missing spaces in JSON schemaChenMoFeiJin2023-09-071-32/+32
| | | | | |
* | | | | | Merge branch 'release-3.27'Brad King2023-09-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'vs-cuda-object-libs' into release-3.27Brad King2023-09-123-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ebff6ebf8 VS: Avoid unnecessary CUDA device linking for OBJECT libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8794
* | \ \ \ \ \ Merge topic 'vs-cuda-object-libs'Brad King2023-09-123-1/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ebff6ebf8 VS: Avoid unnecessary CUDA device linking for OBJECT libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8794
| * | | | | | VS: Avoid unnecessary CUDA device linking for OBJECT librariesRobert Maynard2023-09-113-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without `CudaLink` fields, MSBuild tries to perform a device link step for object libraries with CUDA_SEPARABLE_COMPILATION on them even when not needed. This commonly was encountered when generating PTX or OPTIX-IR output.
* | | | | | | Merge topic 'runcmake-pwd'Brad King2023-09-122-6/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34d46acfc8 Tests/RunCMake: Set $ENV{PWD} before each test Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8795
| * | | | | | | Tests/RunCMake: Set $ENV{PWD} before each testKyle Edwards2023-09-112-6/+12
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will more accurately emulate how a shell would run CMake. Also, don't set $ENV{PWD} in Tests/RunCMake/SymlinkTrees, since RunCMake is now already doing this.