Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jaak Ristioja
CMake
Commits
c0572a15
Commit
c0572a15
authored
3 years ago
by
Johnny Jazeix
Browse files
Options
Downloads
Patches
Plain Diff
CPack/NSIS: Bump minimal version of NSIS to 3.03
Fixes: #22508
parent
0660dc4d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Help/cpack_gen/nsis.rst
+2
-2
2 additions, 2 deletions
Help/cpack_gen/nsis.rst
Help/release/dev/nsis-minimal-version.rst
+4
-0
4 additions, 0 deletions
Help/release/dev/nsis-minimal-version.rst
Source/CPack/cmCPackNSISGenerator.cxx
+2
-2
2 additions, 2 deletions
Source/CPack/cmCPackNSISGenerator.cxx
with
8 additions
and
4 deletions
Help/cpack_gen/nsis.rst
+
2
−
2
View file @
c0572a15
...
...
@@ -3,8 +3,8 @@ CPack NSIS Generator
CPack Nullsoft Scriptable Install System (NSIS) generator specific options.
.. versionchanged:: 3.
17
The NSIS generator requires NSIS 3.0 or newer.
.. versionchanged:: 3.
22
The NSIS generator requires NSIS 3.0
3
or newer.
Variables specific to CPack NSIS generator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
...
This diff is collapsed.
Click to expand it.
Help/release/dev/nsis-minimal-version.rst
0 → 100644
+
4
−
0
View file @
c0572a15
nsis-minimal-version.rst
------------------------
* The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later.
This diff is collapsed.
Click to expand it.
Source/CPack/cmCPackNSISGenerator.cxx
+
2
−
2
View file @
c0572a15
...
...
@@ -487,12 +487,12 @@ int cmCPackNSISGenerator::InitializeInternal()
}
if
(
versionRex
.
find
(
output
))
{
double
nsisVersion
=
atof
(
versionRex
.
match
(
1
).
c_str
());
double
minNSISVersion
=
3.0
;
double
minNSISVersion
=
3.0
3
;
cmCPackLogger
(
cmCPackLog
::
LOG_DEBUG
,
"NSIS Version: "
<<
nsisVersion
<<
std
::
endl
);
if
(
nsisVersion
<
minNSISVersion
)
{
cmCPackLogger
(
cmCPackLog
::
LOG_ERROR
,
"CPack requires NSIS Version 3.0 or greater.
"
"CPack requires NSIS Version 3.0
3
or greater. "
"NSIS found on the system was: "
<<
nsisVersion
<<
std
::
endl
);
return
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment