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 CPack output filename on Windows #1094

Merged
merged 1 commit into from
Jul 3, 2019
Merged

Fix CPack output filename on Windows #1094

merged 1 commit into from
Jul 3, 2019

Conversation

seisman
Copy link
Member

@seisman seisman commented Jul 3, 2019

Description of proposed changes

CPACK_SYSTEM_NAME is empty here, resulting in gmt-6.0.0rc2-.exe on Windows. This PR fixes the issue by checking the 64 bits or 32 bits of the target architecture.

@seisman
Copy link
Member Author

seisman commented Jul 3, 2019

@joa-quim Can you check if this PR can fix the installer name problem?

You don't need to generate the installers, just run the cmake configuration, and you should see something like:

-- Performing Test HAVE_TRADITIONAL_CPP
-- Performing Test HAVE_TRADITIONAL_CPP - Failed
-- Using CFLAGS = '-Wextra -Wall -Wdeclaration-after-statement -O3 -DNDEBUG'
###gmt-6.1.0rc2-win64###
*
*  GMT Version:               : 6.1.0rc2
*
*  Options:

@joa-quim
Copy link
Member

joa-quim commented Jul 3, 2019

Yes, it prints the right name ###gmt-6.1.0rc2-win64###
Funny, I have a variable (BITAGE) in my ConfigUser.cmake that does exactly that bits detection test.

@seisman seisman merged commit 80c42db into 6.0 Jul 3, 2019
@seisman seisman deleted the fix-cpack-filename branch July 3, 2019 22:15
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

2 participants