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

Remove hardcoded path to vc_redist.exe; Fix #3252 #3269

Merged
merged 1 commit into from
Jun 2, 2018

Conversation

ctrlaltca
Copy link
Contributor

Related Ticket(s)

Short roundup of the initial problem

We bundle the MS visual studio redistributable libraries package (vcredist) inside out windows NSIS package.
The path to the vcredist was hardcoded inside CMakeLists.txt, but it contains the MSVC version number, so every time Visual Studio gets updated the path changes.

What will change with this Pull Request?

The path to vcredist gets deduced dynamically from the path where the basic MSVC libraries are found by cmake.

@ctrlaltca ctrlaltca changed the title Remove ahrdcoded path to vc_redist.exe; Fix #3252 Remove hardcoded path to vc_redist.exe; Fix #3252 May 31, 2018
Copy link
Contributor

@Vafthrudnir Vafthrudnir left a comment

Choose a reason for hiding this comment

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

Tested it by renaming the folder to something else; works like a charm. Code looks fine as well.

Great change!

@ZeldaZach ZeldaZach merged commit 89ab7f1 into Cockatrice:master Jun 2, 2018
@ctrlaltca ctrlaltca deleted the fix_3252 branch August 10, 2018 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants