diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-25 13:44:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 13:44:37 -0700 |
| commit | bbb8ef2e9592fe0b53f04ce04dcbd9c5f7646844 (patch) | |
| tree | 14526406671cd86cd0259386c3f345ba6026e441 | |
| parent | dffedfaa320a0e73f2f4e455d0ef8fba7e72d75c (diff) | |
| parent | d0f23cf5f3fbcca4d53cd4192a99cbb4da4aa592 (diff) | |
| download | vcpkg-bbb8ef2e9592fe0b53f04ce04dcbd9c5f7646844.tar.gz vcpkg-bbb8ef2e9592fe0b53f04ce04dcbd9c5f7646844.zip | |
Merge pull request #216 from codeandroid/zeromq-fix-x64
[zeromq] Fixed installation for x64 architecture.
| -rw-r--r-- | ports/zeromq/portfile.cmake | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index d4cd3e1c9..0f75902cc 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -8,6 +8,13 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +# Map from triplet "x86" to "win32" as used in the vcxproj file. +if (TRIPLET_SYSTEM_ARCH MATCHES "x86") + set(MSBUILD_PLATFORM "Win32") +else () + set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/builds/msvc/vs2015/libzmq/libzmq.vcxproj @@ -15,19 +22,19 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) DEBUG_CONFIGURATION DebugDLL ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Debug/v140/dynamic/libzmq.dll + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Debug/v140/dynamic/libzmq.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Release/v140/dynamic/libzmq.dll + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Release/v140/dynamic/libzmq.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Debug/v140/dynamic/libzmq.lib + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Debug/v140/dynamic/libzmq.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Release/v140/dynamic/libzmq.lib + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Release/v140/dynamic/libzmq.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) vcpkg_copy_pdbs() @@ -39,11 +46,11 @@ else() DEBUG_CONFIGURATION DebugLIB ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Debug/v140/static/libzmq.lib + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Debug/v140/static/libzmq.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) file(INSTALL - ${SOURCE_PATH}/bin/Win32/Release/v140/static/libzmq.lib + ${SOURCE_PATH}/bin/${MSBUILD_PLATFORM}/Release/v140/static/libzmq.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) endif() |