mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-09 08:40:11 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,034 Commits 2 Branches 390 Tags
af3d2669a8f9276e4aa39530bbd46efbb6892f43
Commit Graph

1020 Commits

Author SHA1 Message Date
Brad King
9f1ab65806 Merge topic 'ifw-run-program' 
f2f4e66f64 CPackIFW: Add support for RunProgram* config variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !6610
 2021-10-19 09:02:07 -04:00
Brad King
3c855b167f Merge topic 'fix-ifdef-windows' 
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
 2021-10-18 09:29:20 -04:00
Erlend E. Aasland
f2f4e66f64 CPackIFW: Add support for RunProgram* config variables 
This patch adds support for specifying <RunProgram>,
<RunProgramArguments>, and <RunProgramDescription> in the IFW
configuration file.
 2021-10-17 21:15:57 +02:00
Brad King
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks 
Since CMake's default compiler flags with MSVC include `-DWIN32` for
historical reasons, a few preprocessor conditions were accidentally
checking for `WIN32` instead of `_WIN32`.  The corresponding blocks
were left out when compiling official binaries for `cmake.org` because
we hard-code compiler flags without `-DWIN32`.

Fixes: #22764
 2021-10-15 11:39:04 -04:00
Craig Scott
c5ae200d94 Merge topic 'ifw-installer-icon-filenames' 
761b6e2466 CPackIFW: Avoid colliding names for icons / logos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6613
 2021-10-15 08:38:58 -04:00
Konstantin Podsvirov
6b12edfe82 CPackIFW: Add support for DisableCommandLineInterface config attribute 2021-10-14 11:57:38 -04:00
Erlend E. Aasland
761b6e2466 CPackIFW: Avoid colliding names for icons / logos 
Fixes: #16515
 2021-10-15 00:06:19 +11:00
Brad King
f40380077e Merge topic 'clang-warnings' 
09f4edbcef Fix Clang -Wbitwise-instead-of-logical warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6623
 2021-10-14 07:51:31 -04:00
Brad King
fb35854484 Merge topic 'wix_extension' 
ed9dbe9218 CPack/WiX: Add option to skip the WixUIExtension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6619
 2021-10-14 07:50:29 -04:00
Brad King
09f4edbcef Fix Clang -Wbitwise-instead-of-logical warnings 2021-10-13 10:00:08 -04:00
Brad King
90e56da9e7 Merge topic 'ifw-refactor-packagefiles' 
c50329d3ed CPackIFW: Refactor cmCPackIFWGenerator::PackageFiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6617
 2021-10-13 09:02:06 -04:00
Brad King
d7e9ad926a Merge topic 'ifw-product-images' 
6d39c845ee CPackIFW: Add support for ProductImages config option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6611
 2021-10-13 09:00:02 -04:00
Vasileios Anagnostopoulos
ed9dbe9218 CPack/WiX: Add option to skip the WixUIExtension 
Fixes: #22747
 2021-10-12 20:41:00 +02:00
Erlend E. Aasland
c50329d3ed CPackIFW: Refactor cmCPackIFWGenerator::PackageFiles 
Split PackageFiles() into four methods, for increased readability:

- cmCPackIFWGenerator::BuildRepogenCommand
- cmCPackIFWGenerator::BuildBinaryCreatorCommand
- cmCPackIFWGenerator::RunRepogen
- cmCPackIFWGenerator::RunBinaryCreator

Fixes: #22744
 2021-10-11 12:16:04 +02:00
Erlend E. Aasland
6d39c845ee CPackIFW: Add support for ProductImages config option 2021-10-08 22:20:06 +02:00
Erlend E. Aasland
5447dc655e CPackIFW: Add version guard for configuration attributes 
Fixes: #22736
 2021-10-08 18:31:00 +02:00
Sean McBride
f4387c197d CPack/OSXX11: Fix Clang 13 Wunused-but-set-variable 
Use the success/fail flag for the function return value.
 2021-10-05 11:52:35 -04:00
Marc Chevrier
cc56dc7468 Rename cmProp in cmValue 2021-09-21 17:14:04 +02:00
Marc Chevrier
7e154ebd59 cmSystemTools::VersionCompare: use std::string for arguments 2021-09-17 11:58:46 +02:00
Marc Chevrier
7fce78982b Use new SetOption signatures 2021-09-15 18:30:49 +02:00
Marc Chevrier
7aeb262278 cmCPackGenerator::SetOption accepts cmProp or std::string 2021-09-15 18:30:41 +02:00
Marc Chevrier
79362cf117 cmProp: cm::string_view cast operator must be explicit 
To avoid ambiguity on std::string assigment between the following two
cmProp cast operators:
* operator const std::string&() const noexcept
* operator cm::string_view() const noexcept
 2021-09-14 17:42:02 +02:00
Marc Chevrier
202a65759b cmCPackGenerator::GetOption returns cmProp 2021-09-13 09:54:27 -04:00
Brad King
20fec15204 cmArchiveWrite: Check for construction errors on Open 
Also update call sites to report the error.

Issue: #19666
 2021-08-20 11:23:20 -04:00
Brad King
a3ddcdb911 Merge topic 'nsis_ignore_license_page' 
795e406e3b CPack/NSIS: Add option to not display license page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6422
 2021-08-03 11:06:45 -04:00
Brad King
1524505e12 Merge topic 'minimal_nsis' 
c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6425
 2021-08-03 11:05:39 -04:00
Johnny Jazeix
c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03 
Fixes: #22508
 2021-08-02 21:28:30 +02:00
Johnny Jazeix
795e406e3b CPack/NSIS: Add option to not display license page 
Fixes: #22215
 2021-08-01 18:28:47 +02:00
Russell Greene
051da997da CPack/DEB: Add zstd compression for deb packages 2021-07-29 13:40:40 -04:00
Alex Turbov
9dc007e17c Refactor: Drop redundand std::endl calls in the middle of output 2021-07-13 16:42:04 +03:00
Alex Turbov
afcc5449e8 Refactor: Use cmStrToLong instead of std::strtol 2021-07-13 08:56:39 -04:00
Alex Turbov
13549674cc Refactor: Avoid duplicate calls to GetOption("GEN_DBGSYMDIR") 2021-07-13 08:36:12 -04:00
Alex Turbov
7add10f288 Refactor: Deduplicate code of createDebPackages() 
Also, fix incorrect `retval` accumulation.
 2021-07-13 08:36:12 -04:00
Alex Turbov
593ff734b0 CPack/DEB: dbgsym package not generated for non-component packaging 
Fix: #19735
 2021-07-13 08:36:12 -04:00
Alex Turbov
c8f298ae08 Refactor: Extract packaged files finder into a function 2021-07-13 08:36:12 -04:00
Alex Turbov
7fd3134ea1 Refactor: cmCPackDebGenerator::PackageComponents handle else first 
Also, return early to reduce nesting level of the function body.
 2021-07-13 08:35:27 -04:00
Alex Turbov
008321595a Refactor: Change return value to bool for private members 
The `cmCPackDebGenerator::createDeb()` and `cmCPackDebGenerator::createDbgsymDDeb()`
in fact have boolean return value.
 2021-07-13 08:35:27 -04:00
Alex Turbov
45a6fa0c33 Refactor: Drop unnecessary if before return 2021-07-13 08:35:27 -04:00
Alex Turbov
700abe7bca Refactor: Drop useless assignments of retval before return 2021-07-13 08:35:27 -04:00
Alexey Rogachevskiy
9028195a22 CPackDeb: sort package files before generating deb file 
This should make the order in which the files are added to md5sums
and archives is stable, thus making package files more reproducible.

Fixes: #22361
 2021-06-30 08:47:59 -04:00
Craig Scott
445c73d3fa Merge topic 'cpack-install-opts' 
26e36111d3 CPack: Implement new variable CPACK_CUSTOM_INSTALL_VARIABLES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6141
 2021-05-26 18:53:40 -04:00
Jason Erb
a50db66bbd CPack/WIX: Use language en-US, font Consolas, size 14 
Improve rendering of text from `CPACK_RESOURCE_FILE_LICENSE`.

Fixes: #22228
 2021-05-24 12:34:03 -04:00
Nils Gladitz
26e36111d3 CPack: Implement new variable CPACK_CUSTOM_INSTALL_VARIABLES 
The new variable allows projects to define custom key=value pairs of
variables to be set in CPack cmake_install.cmake script invocations.
This allows install(SCRIPT|CODE) to be parameterized at runtime.
 2021-05-24 08:21:49 +10:00
Brad King
4281cd15db clang-tidy: fix bugprone-redundant-branch-condition 2021-05-11 15:08:08 -04:00
Josef Angstenberger
5950e54325 Source: Fix typos and spelling in comments 2021-05-07 17:00:18 +02:00
friendlyanon
4dd4e9dd6c cmGlobalGenerator: Add parallel parameter to GenerateCMakeBuildCommand 2021-05-01 16:08:21 +02:00
Brad King
f881b4e4cc cmCPackDebGenerator: Remove unused local variable 2021-04-28 10:09:52 -04:00
Nils Gladitz
c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 
Merge use of SetFilterOption() into more abstract thread count
in cmArchiveWrite constructor.

libarchive defaulting of threads for threads == 0 seems to be
configuration dependent. Preemptively default thread count via
std::thread::hardware_concurrency().

Also allow negative values for the thread count in which case
the detected hardware concurrency is also used but the given
absolute thread count is used as an upper limit.
 2021-04-22 15:40:13 -04:00
Brad King
ec1b6157cb Update CMake code using KWSys to account for Status return values 
KWSys as of 2021-04-14 changed the return type of `SystemTools`
operations from `bool` to `Status`.  Update our call sites.
This may improve error reporting accuracy in a few places.
 2021-04-14 13:14:09 -04:00
Brad King
d9b8acd238 Merge topic 'ifw-depends-name-version-parsing' 
a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS
f536e6f3fb CPackIFW: Remove redundant variable assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5929
 2021-03-30 09:56:31 -04:00