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

[nanodbc] add support for install --head #4641

Merged
merged 3 commits into from
Nov 2, 2018

Conversation

Farwaykorse
Copy link
Contributor

In issue #4607 an update for nanodbc is requested.

This commit adds support for installing from HEAD with vcpkg install nanodbc --head.

With the upcoming release (v2.13) a few changes are introduced:

A single change when building the current release (v2.12.4):

  • The use of vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) prevents building a dynamic library against the static CRT. (Unless explicitly configured in a triplet.)
    The previous portfile only displayed a status message.

)

vcpkg_install_cmake()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/debug/cmake)
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this be

if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
endif()

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, yes! This is very nice!

Not documented yet?

@ras0219-msft
Copy link
Contributor

LGTM, though I'll wait for your response about vcpkg_fixup_cmake_targets() before merging.

@Farwaykorse
Copy link
Contributor Author

@ras0219-msft working.
Seems this finally fixes #748 (when building from HEAD)

@ras0219-msft ras0219-msft merged commit 01371c8 into microsoft:master Nov 2, 2018
@ras0219-msft
Copy link
Contributor

I'll look forward to 2.13. Thanks for the PR!

dantti pushed a commit to dantti/vcpkg that referenced this pull request Nov 9, 2018
* [nanodbc] add support for use of --head

* single line copyright handler

* support cmake targets for v2.13
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.

2 participants