From d02acf43936912ad2e33053d8d217ade08a64476 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 19 Dec 2018 17:50:38 +0800 Subject: [libsodium] Fix #3374, #3385 --- ports/libsodium/portfile.cmake | 14 ++++++++------ 1 file 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 -- cgit v1.2.3