mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 23:27:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* [ocilib] Fix build failure

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
This commit is contained in:
Jack·Boos·Yu 2020-06-02 08:52:36 +08:00 committed by GitHub
parent c0e7ca335e
commit d0751cde80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ocilib/CONTROL
View File

@ -1,5 +1,5 @@
Source: ocilib Source: ocilib
Version: 4.6.4 Version: 4.6.4-1
Homepage: https://vrogier.github.io/ocilib/ Homepage: https://vrogier.github.io/ocilib/
Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases. Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.
Supports: !(arm|uwp) Supports: !(arm|uwp)

14
ports/ocilib/portfile.cmake
View File

@ -13,10 +13,22 @@ vcpkg_from_github(
if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") 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") 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() else()
set(SOLUTION_TYPE vs2015) set(SOLUTION_TYPE vs2015)
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() endif()
# There is no debug configuration # There is no debug configuration
@ -28,7 +40,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
INCLUDES_SUBPATH include INCLUDES_SUBPATH include
LICENSE_SUBPATH LICENSE LICENSE_SUBPATH LICENSE
RELEASE_CONFIGURATION "Release - ANSI" RELEASE_CONFIGURATION "Release - ANSI"
PLATFORM ${VCPKG_TARGET_ARCHITECTURE} PLATFORM ${PLATFORM}
USE_VCPKG_INTEGRATION USE_VCPKG_INTEGRATION
ALLOW_ROOT_INCLUDES) ALLOW_ROOT_INCLUDES)