aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsdcb <sdflysha@qq.com>2016-09-22 11:16:21 +0800
committersdcb <sdflysha@qq.com>2016-09-22 11:16:21 +0800
commit584d98afe6245607901c50a44db9a82f5d2e27f5 (patch)
treeee42978cbf902cac35e95830906c68f3a94cabc6
parent94bb746e511c749dfd9843893eac6f4fe15751ee (diff)
downloadvcpkg-584d98afe6245607901c50a44db9a82f5d2e27f5.tar.gz
vcpkg-584d98afe6245607901c50a44db9a82f5d2e27f5.zip
fix TRIPLET_SYSTEM_ARCH set to x86 instead of Win32 issue.
-rw-r--r--ports/glew/portfile.cmake20
1 files changed, 14 insertions, 6 deletions
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake
index 1c68866e7..29d857be4 100644
--- a/ports/glew/portfile.cmake
+++ b/ports/glew/portfile.cmake
@@ -26,22 +26,30 @@ vcpkg_build_msbuild(
)
message(STATUS "Installing")
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+ SET(BUILD_ARCH "Win32")
+ELSEIF(TRIPLET_SYSTEM_ARCH MATCHES "x64")
+ SET(BUILD_ARCH "x64")
+ELSE()
+ MESSAGE(SEND_ERROR "Unknown TRIPLET_SYSTEM_ARCH")
+ENDIF()
+
file(INSTALL
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${TRIPLET_SYSTEM_ARCH}/glew32d.dll
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${TRIPLET_SYSTEM_ARCH}/glew32d.pdb
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.dll
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
file(INSTALL
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${TRIPLET_SYSTEM_ARCH}/glew32.dll
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${TRIPLET_SYSTEM_ARCH}/glew32.pdb
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.dll
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
)
file(INSTALL
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Debug/${TRIPLET_SYSTEM_ARCH}/glew32d.lib
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Debug/${BUILD_ARCH}/glew32d.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
)
file(INSTALL
- ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/${TRIPLET_SYSTEM_ARCH}/glew32.lib
+ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/${BUILD_ARCH}/glew32.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
)
file(INSTALL