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

Jump to bottom

cmake: enable curl.rc for all Windows targets #8918

Closed
wants to merge 1 commit into from
Closed

cmake: enable curl.rc for all Windows targets #8918

wants to merge 1 commit into from

Conversation

vszakats
Copy link
Member

Before this patch, it was only enabled for MSVC. This syncs this
configuration with libcurl.rc, which was already included for all
Windows targets.

@vszakats
cmake: enable curl.rc for all Windows targets
8afb1d8 
Before this patch, it was only enabled for MSVC. This syncs this
configuration with libcurl.rc, which was already included for all
Windows targets.
vszakats added a commit to curl/curl-for-win that referenced this pull request May 25, 2022
@vszakats
curl-cmake.sh: clear up two issues [ci skip]
a3ec4e6 
These are upstream issues, with these PRs:
- curl/curl#8918
- curl/curl#8917
@vszakats vszakats added build cmake Windows Windows-specific labels May 25, 2022
@Karlson2k
Copy link
Contributor

Will curl.rc be used for static version as well with this patch?
It must be used only for .DLL.

@vszakats
Copy link
Member Author

@Karlson2k This enables curl.rc for curl.exe, either when it is linked against a static libcurl or libcurl.dll.

vszakats added a commit to vszakats/curl that referenced this pull request May 26, 2022
@vszakats
cmake: do not add libcurl.rc to the static libcurl library [ci skip]
e439394 
Ref: curl#8918 (comment)
vszakats added a commit to vszakats/curl that referenced this pull request May 26, 2022
@vszakats
cmake: do not add libcurl.rc to the static libcurl library
568b1e8 
Ref: curl#8918 (comment)
@vszakats vszakats mentioned this pull request May 26, 2022
Closed
@vszakats
Copy link
Member Author

However, libcurl.rc is at the moment added to both libcurl.dll and static libcurl library, of which the latter is indeed wrong. PR opened.

@vszakats vszakats closed this in 2e76976 May 26, 2022
vszakats added a commit that referenced this pull request May 26, 2022
@vszakats
cmake: do not add libcurl.rc to the static libcurl library
a77d14d 
Fixes: #8918 (comment)

Reviewed-By: Karlson2k@users.noreply.github.com
Closes #8923
@vszakats vszakats deleted the cmake-src-rc branch May 26, 2022 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
build cmake Windows Windows-specific
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vszakats @Karlson2k