diff options
| author | myd7349 <myd7349@gmail.com> | 2018-12-19 17:50:38 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2018-12-19 17:50:38 +0800 |
| commit | d02acf43936912ad2e33053d8d217ade08a64476 (patch) | |
| tree | 53d4b2d2f914557effd436212464ae15f6b3ef61 | |
| parent | d40eb181742082f25c1de6a829552174ae0350d7 (diff) | |
| download | vcpkg-d02acf43936912ad2e33053d8d217ade08a64476.tar.gz vcpkg-d02acf43936912ad2e33053d8d217ade08a64476.zip | |
[libsodium] Fix #3374, #3385
| -rw-r--r-- | ports/libsodium/portfile.cmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index ff473b525..d4bad9e7c 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -22,18 +22,20 @@ else() set(LIBSODIUM_DEBUG_CONFIGURATION Debug) endif() -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj - RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} -) - IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") SET(BUILD_ARCH "Win32") ELSE() SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) ENDIF() +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj + RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} + OPTIONS + /p:ForceImportBeforeCppTargets=${SOURCE_PATH}/builds/msvc/properties/${BUILD_ARCH}.props +) + file(INSTALL ${SOURCE_PATH}/src/libsodium/include/sodium.h DESTINATION ${CURRENT_PACKAGES_DIR}/include |