summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | | |/ | |/|
| * | CMake 3.22.0v3.22.0Brad King2021-11-181-1/+1
| | |
* | | Merge branch 'release-3.22'Brad King2021-11-180-0/+0
|\ \ \ | |/ /
| * | Merge topic 'fix-mingw32-gcc11-ice' into release-3.22Brad King2021-11-181-5/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits. f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6737
* | \ \ Merge topic 'fix-mingw32-gcc11-ice'Brad King2021-11-181-5/+11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits. f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6737
| * | | MINGW-w64: Fix string(TIMESTAMP) build on 32bits.Antons Jeļkins2021-11-181-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase the string(TIMESTAMP) implementation not to cause gcc-11 ICE on MSYS2/mingw32. Fixes: #22916
| * | | cmTimestamp: Declare component buffer before MinGW-specific codeAntons Jeļkins2021-11-181-2/+2
| |/ /
* | | Merge topic 'ci-nmake-jom'Brad King2021-11-185-6/+101
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b9975d9b5 ci: Add JOM nightly CI job ec68e3c5c6 ci: Add NMake nightly CI job bd00882f49 gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block 99c335c8e8 gitlab-ci: Clarify MSVC v71 job script config block name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6742
| * | | ci: Add JOM nightly CI jobBrad King2021-11-174-0/+58
| | | |
| * | | ci: Add NMake nightly CI jobBrad King2021-11-173-0/+32
| | | |
| * | | gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config blockBrad King2021-11-171-4/+9
| | | | | | | | | | | | | | | | Isolate the vcvarsall variables in a dedicated block.
| * | | gitlab-ci: Clarify MSVC v71 job script config block nameBrad King2021-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | Rename `cmake_test_windows_{nmake => msvc}` since it fetches MSVC, not NMake.
* | | | Merge topic 'FindHDF5-Fortran-without-HL'Brad King2021-11-181-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86c697f49a FindHDF5: Fix Fortran compiler interrogation without HL library Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6739
| * | | | FindHDF5: Fix Fortran compiler interrogation without HL libraryHåkon Strandenes2021-11-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the HDF5 HL library is not available, FindHDF5 with Fortran does not work. The problem is because `cmake_hdf5_test.f90` tries to "use h5lt" and "use h5ds", which comes from the HL library. Then the basic compiler check fails completely. The two "use" lines were added by commit 00405af0f1 (HDF5: Refactor the use of compiler wrappers, 2016-04-04, v3.6.0-rc1~85^2) along with the rest of the check. Remove them. Fixes: #22890
* | | | | Merge branch 'release-3.22'Brad King2021-11-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-180-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.21'Brad King2021-11-180-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-11-180-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.21Brad King2021-11-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6740
* | \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-11-180-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.20Brad King2021-11-171-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !6740
* | | | | | | | Merge branch 'release-3.22'Brad King2021-11-180-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge topic 'IntelLLVM-Fortran-copy-mod' into release-3.22Brad King2021-11-181-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6740
* | | | | | | | Merge topic 'IntelLLVM-Fortran-copy-mod'Brad King2021-11-181-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6740
| * | | | | | | IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generatorsBrad King2021-11-171-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Makefile generators use an internal `cmake -E cmake_copy_f90_mod` tool to avoid rebuilding module consumers when the `.mod` content changes only in a trivial way (e.g. the time it was built). This is done with logic specific to each vendor's module file format. Enable the "Intel" format support when using the IntelLLVM compiler (ifx) too. Issue: #22922
* | | | | | | Merge branch 'release-3.22'Brad King2021-11-180-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'backport-libuv-mingw-w64' into release-3.22Brad King2021-11-181-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6735
generated by cgit v0.12 at 2025-09-07 10:03:54 (GMT)