summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* install: Implement new install(CODE|SCRIPT) option ALL_COMPONENTSNils Gladitz2021-05-1925-20/+133
| | | | | | | | | | | In a per-component installation the generated installation scripts are invoked once for each component. Per default custom installation script code added by install(CODE|SCRIPT) only runs for one specific component in this context. The new ALL_COMPONENTS option allows custom script code to be run once for each component being installed.
* Merge branch 'release-3.20'Brad King2021-05-190-0/+0
|\
| * Merge topic 'nvhpc-ninja-depfile' into release-3.20Brad King2021-05-192-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | 364f6af1d7 NVHPC: Support Ninja dependency scanning 521cfc38a3 NVHPC: Support explicit language flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6136
* | \ Merge topic 'nvhpc-ninja-depfile'Brad King2021-05-192-0/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 364f6af1d7 NVHPC: Support Ninja dependency scanning 521cfc38a3 NVHPC: Support explicit language flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6136
| * | NVHPC: Support Ninja dependency scanningRobert Maynard2021-05-182-0/+10
| | | | | | | | | | | | Fixes: #22168
| * | NVHPC: Support explicit language flagsRobert Maynard2021-05-182-0/+8
| | |
* | | CMake Nightly Date StampKitware Robot2021-05-191-1/+1
| | |
* | | Merge topic 'gitignore'Brad King2021-05-181-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cbeff3082d .gitignore: Add CLion directories and VS build directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6138
| * | | .gitignore: Add CLion directories and VS build directoryViktor Wallner2021-05-181-0/+7
|/ / /
* | | Merge topic 'relative-paths'Brad King2021-05-1818-257/+188
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8526756b61 cmOutputConverter: Adopt relative path conversion helpers 013ec595c8 cmLocalGenerator: De-duplicate StateSnapshot member 24bfdbcffb cmLocalGenerator: Remove unused MaybeRelativeToCurSrcDir method d6fe1bdb6d cmLocalGenerator: Localize logic mapping source path to object file name 4cb6a53bf5 cmListFileCache: Simplify relative path conversion in backtraces 5b3a71a83f cmSystemTools: Adopt RelativeIfUnder helper ea9b1d36b8 cmStateDirectory: Clarify relative path top selection logic 2d9109df7c cmStateDirectory: Remove network path logic from relative path top selection ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6128
| * | | cmOutputConverter: Adopt relative path conversion helpersBrad King2021-05-1712-177/+142
| | | | | | | | | | | | | | | | Move them up from cmLocalGenerator and out of cmStateDirectory.
| * | | cmLocalGenerator: De-duplicate StateSnapshot memberBrad King2021-05-173-4/+3
| | | | | | | | | | | | | | | | We have the member from the cmOutputConverter parent.
| * | | cmLocalGenerator: Remove unused MaybeRelativeToCurSrcDir methodBrad King2021-05-172-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent update to `GetObjectFileNameWithoutTarget`, we no longer have any call sites for `MaybeRelativeToCurSrcDir`. It does not make sense for the generator to produce paths relative to the source tree in general, so remove the method.
| * | | cmLocalGenerator: Localize logic mapping source path to object file nameBrad King2021-05-171-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We select an object file name based on the path to its source file. Localize the logic for shortening this via relative paths. It does not need to use the generator-wide relative path conversion rules because we are not actually generating a relative path that needs to be consistent with anything else.
| * | | cmListFileCache: Simplify relative path conversion in backtracesBrad King2021-05-172-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing paths to CMake input files does not need to use the generator-wide relative path conversion rules because we are not actually generating a relative path for the build system that needs to be consistent with anything else. Instead, simply print a relative path if it does not need to start in `../`, and otherwise an absolute path.
| * | | cmSystemTools: Adopt RelativeIfUnder helperBrad King2021-05-173-9/+21
| | | | | | | | | | | | | | | | This returns a relative path if it does not start in `../`.
| * | | cmStateDirectory: Clarify relative path top selection logicBrad King2021-05-171-38/+18
| | | | | | | | | | | | | | | | | | | | Re-implement the same algorithm using direct iteration without collecting a vector first.
| * | | cmStateDirectory: Remove network path logic from relative path top selectionBrad King2021-05-171-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic skipping relative paths for build trees on network paths came from commit b5035770bc (BUG: On Windows network paths do not really work..., 2003-12-24, v2.4.0~3517). However, since commit ad4055f3e2 (ENH: Set RelativePathTopSource and RelativePathTopBinary independently ..., 2007-03-07, v2.6.0~2061) we effectively ignore this logic if the build tree is inside the source tree on a network path. Also, it is not clear that logic using `RelativePathTopBinary` is prepared for it to be empty. Remove the logic for now. If a problem comes up, we can choose a new approach.
| * | | cmStateDirectory: Fix comment on relative path top directory selectionBrad King2021-05-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix the comment added by commit f6d4fa63f8 (cmStateDirectory: Comment relative path top directory selection approach, 2021-05-13) to describe the actual behavior.
| * | | Makefiles: Remove non-functioning relative path conversionBrad King2021-05-171-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMake 3.6 and below, running cmake --build . --target "$(pwd)/SomeTarget" with a Makefiles generator automatically converted the target name and invoked `make SomeTarget`. This made the build command work even though make "$(pwd)/SomeTarget" would fail. This behavior was not implemented for any other generators, and does not make sense because `cmake --build` is supposed to be a thin wrapper around the native build tool. It has also been broken since commit 8d47a20f13 (cmOutputConverter: use new ConvertToRelativePath signature internally, 2016-06-16, v3.7.0-rc1~90^2~1) because cmState's relative path conversion logic is not initialized in `cmake --build`. Remove the non-functioning code.
* | | | Merge topic 'doc-link-compile-options'Brad King2021-05-186-6/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2eba7d7524 Help: Add SHELL, LINKER and host/device discussions to property docs b20c1f4880 Help: Make SHELL option examples more generic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6130
| * | | | Help: Add SHELL, LINKER and host/device discussions to property docsCraig Scott2021-05-156-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section headings are also added for each common block to help guide the reader and improve navigation. Fixes: #21640
| * | | | Help: Make SHELL option examples more genericCraig Scott2021-05-151-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments at the bottom of the docs for add_compile_options() and target_compile_options() recommend using other commands if setting compiler definitions. Change the examples we use for the SHELL: functionality to use -option instead of -D so that we don't violate our own recommendations. This also makes the examples more appropriate for use with link options as well. Tweak the wording to not specify the type of option being discussed. This will already be clear from the page the text is included into and it avoids naming unrelated option types for the given page.
* | | | | CMake Nightly Date StampKitware Robot2021-05-181-1/+1
| |/ / / |/| | |
* | | | Merge topic 'doc-ep-configure-build-passthrough'Brad King2021-05-171-3/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf3bc271d1 Help: Clarify details passed to ExternalProject configure and build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6135
| * | | | Help: Clarify details passed to ExternalProject configure and buildCraig Scott2021-05-161-3/+20
| |/ / / | | | | | | | | Fixes: #22116
* | | | Merge topic 'doc-cmake_minimum_version'Brad King2021-05-172-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b00a171b2b Help: Clarify calling cmake_minimum_required() inside a function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6129
| * | | | Help: Clarify calling cmake_minimum_required() inside a functionCraig Scott2021-05-152-3/+9
| |/ / / | | | | | | | | Fixes: #21519
* | | | Merge topic 'OBJECT-lib-PIC-transitive'Brad King2021-05-172-7/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 929c8a7860 INTERFACE_POSITION_INDEPENDENT_CODE must be transitive for OBJECT library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6127
| * | | | INTERFACE_POSITION_INDEPENDENT_CODE must be transitive for OBJECT libraryMarc Chevrier2021-05-142-7/+3
| | | | | | | | | | | | | | | | | | | | Fixes: #22174
* | | | | Merge topic 'IncludeInfo-var-expand'Brad King2021-05-171-25/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caea48eec9 CMakeParseImplicitIncludeInfo: remove needless variable expansions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6125
| * | | | | CMakeParseImplicitIncludeInfo: remove needless variable expansionsRolf Eike Beer2021-05-131-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They seem to actually cause trouble, like an error reported on IRC where some but not all CMake invocations may end up with an error like this: CMake Warning (dev) at /usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake:74 (if): Policy CMP0054 is not set: Only interpret if() arguments as variables or keywords when unquoted. Run "cmake --help-policy CMP0054" for policy details. Use the cmake_policy command to set the policy and suppress this warning. Quoted keywords like ")" will no longer be interpreted as keywords when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Call Stack (most recent call first): /usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake:179 (cmake_parse_implicit_include_line) /usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:119 (cmake_parse_implicit_include_info) /usr/share/cmake/Modules/CMakeTestCXXCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI) CMakeLists.txt:24 (project) This warning is for project developers. Use -Wno-dev to suppress it. CMake Error at /usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake:74 (if): if given arguments: "GNU" "STREQUAL" "SunPro" "AND" "(" ")" "MATCHES" "-D__SUNPRO_C" "OR" ")" "MATCHES" "-D__SUNPRO_F" ")" I suspect that the line ends up being just ")", which then causes this error.
* | | | | | CMake Nightly Date StampKitware Robot2021-05-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-05-161-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-05-151-1/+1
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-05-140-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'sphinx-4' into release-3.20Brad King2021-05-141-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb9c69ed70 Utilities/Sphinx: Update man page config for Sphinx 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6126
* | \ \ \ \ Merge topic 'sphinx-4'Brad King2021-05-141-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | bb9c69ed70 Utilities/Sphinx: Update man page config for Sphinx 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6126
| * | | | Utilities/Sphinx: Update man page config for Sphinx 4Brad King2021-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sphinx 4 by default generates `man/#/foo.#`, but older versions generate `man/foo.#` as our install rules expect. Update our Sphinx config file to tell Sphinx 4 to use the old layout. Fixes: #22192
* | | | | Merge topic 'relative-paths'Brad King2021-05-1433-376/+277
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6d4fa63f8 cmStateDirectory: Comment relative path top directory selection approach f0ffb1e2d4 cmGlobalGenerator: Simplify relative path conversion in AddRuleHash d346805e41 cmLocalCommonGenerator: Select work directory semantically 15fa320071 cmLocalGenerator: Factor out relative path conversion helpers 1879f1bcbc cmLocalCommonGenerator: Factor out relative path conversion helper 1d1d88d3c8 cmMakefileTargetGenerator: Clarify name of relative path conversion helper ec1ea13066 cmDependsFortran: Simplify relative path conversion helper ba7b939831 cmStateDirectory: Rename ConvertToRelPathIf{Not => }Contained ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6122
| * | | | | cmStateDirectory: Comment relative path top directory selection approachBrad King2021-05-131-0/+6
| | | | | |
| * | | | | cmGlobalGenerator: Simplify relative path conversion in AddRuleHashBrad King2021-05-131-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 204aecdf82 (cmGlobalGenerator: Port configure-time code to cmMakefile., 2015-08-02, v3.4.0-rc1~234^2~8). `AddRuleHash` is generate-time code.
| * | | | | cmLocalCommonGenerator: Select work directory semanticallyBrad King2021-05-134-10/+30
| | | | | |
| * | | | | cmLocalGenerator: Factor out relative path conversion helpersBrad King2021-05-1323-326/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most calls to `MaybeConvertToRelativePath` use one of our common work directories (e.g. top of the build tree) as the local path. Add helpers for each of the common cases to simplify and clarify call sites.
| * | | | | cmLocalCommonGenerator: Factor out relative path conversion helperBrad King2021-05-133-4/+10
| | | | | |
| * | | | | cmMakefileTargetGenerator: Clarify name of relative path conversion helperBrad King2021-05-131-6/+6
| | | | | |
| * | | | | cmDependsFortran: Simplify relative path conversion helperBrad King2021-05-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8377d9e00b (Fortran: Inline conversion to relative path, 2016-10-04, v3.8.0-rc1~494^2~4). The inline implementation is still identical to what was previously called. Restore the call again.
| * | | | | cmStateDirectory: Rename ConvertToRelPathIf{Not => }ContainedBrad King2021-05-127-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | The "Not" in the method name is backward from its logic.
| * | | | | cmGlobalGhsMultiGenerator: Simplify relative path conversion logicBrad King2021-05-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our call to `MaybeConvertToRelativePath` uses paths that always pass the "maybe" checks. Use `ForceToRelativePath` directly.
| * | | | | cmGlobalXCodeGenerator: Simplify relative path conversion under project rootBrad King2021-05-122-12/+5
| | | | | |
generated by cgit v0.12 at 2025-01-12 04:01:09 (GMT)