Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NSIS Template for NSIS3 #4093

Merged
merged 1 commit into from
May 21, 2020

Conversation

UnaNancyOwen
Copy link
Member

NSIS2 is end of support in CPacks of CMake 3.17 or later.
We should be migrate to NSIS3 for generate PCL All-in-one Installer.

The CPack NSIS Generator now requires NSIS 3.0 or later.
https://cmake.org/cmake/help/v3.17/release/3.17.html#deprecated-and-removed-features

The template of PCL All-in-one Installer generally works as it is on NSIS2, but one error occurs with NSIS3. That means multiple definitions of "RemoveSection" macro.

# Run command: "C:/Program Files (x86)/NSIS/makensis.exe" "C:/pcl-1.11.0/build/_CPack_Packages/win64/NSIS/project.nsi"
# Output:
Processing config: C:\Program Files (x86)\NSIS\nsisconf.nsh

Processing script file: "C:/pcl-1.11.0/build/_CPack_Packages/win64/NSIS/project.nsi" (ACP)

!macro: macro named "RemoveSection" already exists!

Error in script "C:/pcl-1.11.0/build/_CPack_Packages/win64/NSIS/project.nsi" on line 182 -- aborting creation process

It is already defined in Sections.nsh of NSIS3.
Therefor, This pull request will fix by undefine "RemoveSection" macro in the first.

Fix an error in macro multiple definition.
@UnaNancyOwen UnaNancyOwen added changelog: fix Meta-information for changelog generation module: cmake platform: windows labels May 12, 2020
@UnaNancyOwen UnaNancyOwen added this to the pcl-1.11.1 milestone May 12, 2020
@kunaltyagi
Copy link
Member

Cancelled CI manually.

@UnaNancyOwen Could you please share the steps for creating the installers on the issue tracking automating releases: #4053

@kunaltyagi kunaltyagi added the needs: code review Specify why not closed/merged yet label May 12, 2020
@UnaNancyOwen
Copy link
Member Author

Could you please share the steps for creating the installers

OK, It will take some time to put it all together.
Please give me a few days time.

Copy link
Member

@SergioRAgostinho SergioRAgostinho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving but I have 0 clue about anything NSIS related. :)

@kunaltyagi
Copy link
Member

Merging because we like @UnaNancyOwen 😆

@kunaltyagi kunaltyagi merged commit c80e408 into PointCloudLibrary:master May 21, 2020
@SergioRAgostinho SergioRAgostinho removed the needs: code review Specify why not closed/merged yet label May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog: fix Meta-information for changelog generation module: cmake platform: windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants