summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gitlab-ci: shorten job prefixesBen Boeckel2021-11-223-146/+166
| | | | | | | | | | This helps to maximize the amount of information visible in the GitLab web interface. Also document their meaning in the developer documentation and in the CI configuration file directly. See: https://gitlab.com/gitlab-org/gitlab/-/issues/8496
* gitlab-ci: fix comment typoBen Boeckel2021-11-221-1/+1
|
* Merge topic 'FindGTest-target-for-gmock'Brad King2021-11-223-1/+63
|\ | | | | | | | | | | | | 50bf457a0d FindGTest: Add target for gmock library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6632
| * FindGTest: Add target for gmock libraryEero Aaltonen2021-11-223-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `googlemock` has been absorbed into the [googletest](https://github.com/google/googletest) project and is built and installed from the same source tree. As GTest may be built with or without GMock, skip GMock if it is not present. Do not provide result variables for GMock. They are not provided by upstream GTest's CMake Package Configuration File. Also update the test case to cover linking to `GTest::gmock`.
* | Merge topic 'cpack-productbuild-identifier'Brad King2021-11-224-5/+34
|\ \ | | | | | | | | | | | | | | | | | | 7213ceb869 CPack/productbuild: Add option to customize product identifier Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6738
| * | CPack/productbuild: Add option to customize product identifierGreg Fiumara2021-11-184-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | This adds a new option, CPACK_PRODUCTBUILD_IDENTIFIER, which allows for customization of the productbuild product identifier within the CPack productbuild generator. Fixes: #20830
* | | Merge topic 'GNUInstallDirs-multiarch-prefixes'Brad King2021-11-223-7/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd9584b352 GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6748
| * | | GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixesMathieu Malaterre2021-11-193-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On typical Debian amd64 system (bullseye), multiarch is setup as: ``` % cat /etc/ld.so.conf.d/x86_64-linux-gnu.conf /usr/local/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu ``` Where: ``` % apt-cache policy libc6:amd64 libc6: Installed: 2.31-13+deb11u2 Candidate: 2.31-13+deb11u2 Version table: *** 2.31-13+deb11u2 500 500 http://deb.debian.org/debian bullseye/main amd64 Packages 100 /var/lib/dpkg/status ``` Update GNUInstallDirs to support all three cases `/`, `/usr/` and `/usr/local/`. Fixes: #19698
* | | | Merge branch 'release-3.22'Brad King2021-11-220-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'env-mod-path-list-separator' into release-3.22Brad King2021-11-221-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6753
* | \ \ \ \ Merge topic 'env-mod-path-list-separator'Brad King2021-11-221-2/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6753
| * | | | | Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on hostCraig Scott2021-11-211-2/+4
| | | | | | | | | | | | | | | | | | Fixes: #22937
* | | | | | Merge topic 'automoc-cross-windows'Brad King2021-11-221-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6751
| * | | | | | AutoMoc: Only add the WIN32 define if the target system is WindowsJoerg Bornemann2021-11-191-3/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's no moc_predefs.h generated, we add the WIN32 define as fallback. Before this change, we added the WIN32 define if the host system was Windows. That's wrong when cross-compiling. Now we're checking whether the target system is Windows. Fixes: #22933
* | | | | | Merge topic 'cudatoolkit_update_cusparse_deps'Brad King2021-11-221-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fedca357d2 FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6745
| * | | | | | FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2Robert Maynard2021-11-191-0/+17
| | | | | | |
* | | | | | | Merge branch 'release-3.22'Brad King2021-11-220-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-220-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'UseSWIG-create-workingdir' into release-3.22Brad King2021-11-222-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | Merge-request: !6750
* | | | | | | | Merge branch 'release-3.21'Brad King2021-11-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'UseSWIG-create-workingdir' into release-3.21Brad King2021-11-192-1/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !6750
* | | | | | | | Merge topic 'UseSWIG-create-workingdir'Brad King2021-11-222-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7224eb5185 UseSWIG: ensure directory for depfile exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6750
| * | | | | | | UseSWIG: ensure directory for depfile existsMarc Chevrier2021-11-192-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `Visual Studio` and `Xcode` generators are used, directory for depfile is not implicitely created by CMake when OUTFILE_DIR option is used. Fixes: #22932
* | | | | | | CMake Nightly Date StampKitware Robot2021-11-221-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-11-211-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-11-201-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.22'Brad King2021-11-190-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'ci-gmock' into release-3.22Brad King2021-11-193-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fae34ea007 ci: add gmock to Debian base images Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6746
* | \ \ \ \ \ Merge topic 'ci-gmock'Brad King2021-11-193-2/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fae34ea007 ci: add gmock to Debian base images Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6746
| * | | | | | ci: add gmock to Debian base imagesBrad King2021-11-183-2/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | It is already in the Fedora base images.
* | | | | | Merge topic 'custom-command-unique_ptr'Brad King2021-11-1920-572/+500
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bb2542535 cmMakefile: Simplify Add*Command and adopt to cmAddCustom*Command c46b041a3b cmLocalGenerator: Simplify Add{Custom,Utility}Command 68b4e3b255 cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8 e37511ae7e cmMakefile: Simplify detail:::Add{Custom,Utility}Command 90e1206f25 cmMakefile: Introduce GeneratorAction as the class. 9b31a97748 cmCustomCommand: Move constructor arguments to individual setters d0158b765b cmMakefile: Move CMP0116 lookup into Add{Custom,Utility}Command Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6708
| * | | | | | cmMakefile: Simplify Add*Command and adopt to cmAddCustom*CommandNAKAMURA Takumi2021-11-188-174/+133
| | | | | | |
| * | | | | | cmLocalGenerator: Simplify Add{Custom,Utility}CommandNAKAMURA Takumi2021-11-188-232/+154
| | | | | | |
| * | | | | | cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8NAKAMURA Takumi2021-11-181-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to AddCustomCommandToTarget for "Checking File Globs" had misaligned arguments and previously passed `stdPipesUTF8` as `escapeOldStyle`. For now, set `escapeOldStyle` as `true`. Also `stdPipesUTF8` is `true` here.
| * | | | | | cmMakefile: Simplify detail:::Add{Custom,Utility}CommandNAKAMURA Takumi2021-11-184-188/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note 1: `detail::AddCustomCommandToTarget()` resets cc, since cc is not moved away. Note 2: In `detail::AddUtilityCommand()`, a few vars are preserved before using. Their refs will be alive in most cases, but cc might be destroyed in the future.
| * | | | | | cmMakefile: Introduce GeneratorAction as the class.NAKAMURA Takumi2021-11-182-5/+32
| | | | | | |
| * | | | | | cmCustomCommand: Move constructor arguments to individual settersNAKAMURA Takumi2021-11-188-59/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `cmCustomCommand` have just only default constructor. Use each setter instead. This follows the builder pattern. Introduce `cc::SetOutputs(std::string output)`. This will be used later, as substitution for `cc::SetOutputs({output})`.
| * | | | | | cmMakefile: Move CMP0116 lookup into Add{Custom,Utility}CommandNAKAMURA Takumi2021-11-188-75/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid repeating it at every call site.
* | | | | | | Merge topic 'ghs_initial_setup'Brad King2021-11-199-201/+276
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa59eaac4f GHS: Allow setting GHS variables from toolchain file ab6f0b51b1 GHS: Add note about -T and path style a55b5c4e18 GHS: Update BSP selection logic 0427f22539 GHS: Update RTOS selection logic e006b87cc6 GHS: GHSMULTI - Update documentation to match implementation 83eb5695e9 GHS: Update toolset selection logic 8114ddcad1 GHS: Continue splitting variables used by generator 831607889f GHS: Update selection of primaryTarget in MULTI project file ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6715
| * | | | | | GHS: Allow setting GHS variables from toolchain fileFred Baksik2021-11-152-51/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update generator to use the current variable definition, not the CACHE definition. * Avoid overwriting toolchain variables and avoid developer warnings when setting up the GHS variables. -- A cache entry is only required when: a) The toolchain uses set( CACHE ) to set the variable b) A -D or preset value was used to set the variable The cache entry is required so that the TYPE gets set properly. -- Avoid the Policy CMP0126 warnings: setting cache variable when normal variable exists * Move GHS_PRIMARY_TARGET back into area so non-GHS generator toolchain file can trigger the OS search.
| * | | | | | GHS: Add note about -T and path styleFred Baksik2021-11-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If backslashes are used for CMAKE_GENERATOR_TOOLSET, then ctest processing will complain about COMP0010. For example: Syntax error in cmake code at C:/Users/XXX/test_bld/Tests/CTestTestfile.cmake:253 when parsing string C:\Users\XXX\bin_tools\XXX Invalid escape sequence \U Policy CMP0010 is not set: Bad variable reference syntax is an error. Run "cmake --help-policy CMP0010" for policy details. Use the cmake_policy command to set the policy and suppress this warning.
| * | | | | | GHS: Update BSP selection logicFred Baksik2021-11-153-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selection of a BSP only needs to be performed if not set by user. Remove all the logic for printing error and status messages about BSP selection. These messages also breaks CMake tests. NOTE: If BSP selection fails then the compiler checks will result in a build error. The build error will report that the BSP does not exist.
| * | | | | | GHS: Update RTOS selection logicFred Baksik2021-11-153-47/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selection of an RTOS only needs to be performed if not set by user. Avoid CMake developer warnings for setting GHS_OS_DIR multiple times. Instead only set it once after searching has been performed. Remove all the logic for printing error and status messages about RTOS selection. This was broken and reporting incorrect messages. These messages also breaks CMake tests. NOTE: If RTOS selection fails then the compiler checks will result in a build error. The build error will report that the RTOS "GHS_OS_DIR-NOT-SPECIFIED" does not exist.
| * | | | | | GHS: GHSMULTI - Update documentation to match implementationFred Baksik2021-11-154-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The variable being set was named `GHSMULTI` not `GHS-MULTI`.
| * | | | | | GHS: Update toolset selection logicFred Baksik2021-11-153-43/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Ensure that GHS_TOOLSET_ROOT is used as a path * Converts directory path slashes to CMake style -- Use ComparePath() to properly check for path changes of build tool * Accounts for Windows file-system case insensitivity. -- Don't print message "defaulting" messages (this causes CMake test failures) -- Don't force update CMAKE_GENERATOR_TOOLSET back into cache when `-T` is not used on initial configure. This change avoids an unnessary error message when accidentally using `-T` in subsequent runs but the same tools are always used. -- Use IssueMessage() for error messages.
| * | | | | | GHS: Continue splitting variables used by generatorFred Baksik2021-11-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to use GHS-MULTI platform in other generators that want to use the GHS-MULTI platform and compilers.
| * | | | | | GHS: Update selection of primaryTarget in MULTI project fileFred Baksik2021-11-153-45/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to ``-A`` handling: * Don't force CMAKE_GENERATOR_PLATFORM into cache when using default value (breaks using CMake presets). * Don't print message when using default value (breaks CMake tests). Changes to ``GHS_PRIMARY_TARGET`` handling: * Add as a cache variable so its known to GUI * Don't always include``GHS_TARGET_PLATFORM``, it's only needed if ``GHS_PRIMARY_TARGET`` wasn't set by the user. * Set ``GHS_PRIMARY_TARGET`` during platform selection instead of when a language is enabled. By performing this sooner ``GHS_TARGET_PLATFORM`` is not always required to be set into cache.
| * | | | | | GHS: Update generator documentationFred Baksik2021-11-151-29/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Break up into different sections and add examples
* | | | | | | CMake Nightly Date StampKitware Robot2021-11-191-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'release-3.22'Brad King2021-11-180-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |