Skip to content

[vcpkg baseline][ocilib] Fix build failure #11646

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.

Sign up for GitHub

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

Merged
dan-shaw merged 5 commits into from
Jun 2, 2020
Merged

[vcpkg baseline][ocilib] Fix build failure #11646

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cef9bed
[ocilib] Fix build failure
May 29, 2020
7e15fde
Update ports/ocilib/portfile.cmake
LilyWangL May 29, 2020
4aa708e
Update ports/ocilib/portfile.cmake
LilyWangL May 29, 2020
df69249
Update ports/ocilib/portfile.cmake
LilyWangL May 29, 2020
7cc3888
Update ports/ocilib/portfile.cmake
LilyWangL May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/ocilib/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: ocilib
Version: 4.6.4
Version: 4.6.4-1
Homepage: https://vrogier.github.io/ocilib/
Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.
Supports: !(arm|uwp)
18 changes: 15 additions & 3 deletions ports/ocilib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,24 @@ vcpkg_from_github(

if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
set(SOLUTION_TYPE vs2019)
set(SOLUTION_TYPE vs2019)
set(OCILIB_ARCH_X86 x86)
set(OCILIB_ARCH_X64 x64)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
set(SOLUTION_TYPE vs2017)
set(SOLUTION_TYPE vs2017)
set(OCILIB_ARCH_X86 Win32)
set(OCILIB_ARCH_X64 Win64)
else()
set(SOLUTION_TYPE vs2015)
Comment thread
LilyWangL marked this conversation as resolved.
Outdated
set(OCILIB_ARCH_X86 Win32)
set(OCILIB_ARCH_X64 Win64)
endif()

if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(PLATFORM ${OCILIB_ARCH_X86})
else()
set(PLATFORM ${OCILIB_ARCH_X64})
endif()

# There is no debug configuration
# As it is a C library, build the release configuration and copy its output to the debug folder
Expand All @@ -28,7 +40,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
INCLUDES_SUBPATH include
LICENSE_SUBPATH LICENSE
RELEASE_CONFIGURATION "Release - ANSI"
PLATFORM ${VCPKG_TARGET_ARCHITECTURE}
PLATFORM ${PLATFORM}
USE_VCPKG_INTEGRATION
ALLOW_ROOT_INCLUDES)

Expand Down