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

List file to add extra exe's to the Win installer #909

Closed
wants to merge 1 commit into from
Closed

Conversation

joa-quim
Copy link
Member

On Windows the installer ships with a complete GDAL + PROJ4 (V6). But for that I need to provide the list of the exe's to include in the installer. This file has that, but for my own paths.

@joa-quim joa-quim requested a review from a team June 14, 2019 14:36
@@ -70,6 +70,11 @@ if (FFTW3F_LIBRARY)
check_symbol_exists (fftwf_import_wisdom_from_filename fftw3.h FFTW3F_VERSION_RECENT)
cmake_pop_check_state() # restore state of CMAKE_REQUIRED_*

# For some reason in my machine check_symbol_exists() call above is not able to its job
Copy link
Member

Choose a reason for hiding this comment

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

I don't think it's a good idea to commit your WIN32 trick here, since the Windows CI doesn't have such problem.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm, that change slipped in but I actually wanted to submit it as an separate PR. Yes, you are right that Windows CI does not seem to have that problem. But I do, and since it's me who makes the installers, I need to have it working preferably to always have an uncommitted change in my local repo (which the tyrant Git refuses to update)

Copy link
Member

Choose a reason for hiding this comment

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

Any way to work around having to commit this into the FindFFTW.cmake file, i.e., via some conditional include statement or similar?

Copy link
Member Author

Choose a reason for hiding this comment

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

I already wrapped it under a if (WIN32 AND NOT FFTW3F_VERSION_RECENT). According to the comment in line 69, this would only break for the case of someone building on windows with a static FFTW3 build. A case that as far as we know, never happened before, nor is likely to happen in a foreseeable future.

@seisman
Copy link
Member

seisman commented Jun 15, 2019

These changes were merged in #922.

@seisman seisman closed this Jun 15, 2019
@seisman seisman deleted the exeslist branch July 2, 2019 18:10
obaney pushed a commit to obaney/gmt that referenced this pull request Aug 18, 2021
…ls#909)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.0.10 to v1.2.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](codecov/codecov-action@v1.0.10...e156083)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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