From 6bdf97744a5c3dacd799536e68706fbadf7e25d5 Mon Sep 17 00:00:00 2001 From: sdcb Date: Thu, 22 Sep 2016 13:48:10 +0800 Subject: fix https://github.com/Microsoft/vcpkg/issues/11. --- ports/glew/portfile.cmake | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 320db8043..bc95503bc 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -26,22 +26,28 @@ vcpkg_build_msbuild( ) message(STATUS "Installing") +IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") + SET(BUILD_ARCH "Win32") +ELSE() + SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) +ENDIF() + file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/Win32/glew32d.dll - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/Win32/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/Win32/glew32.dll - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/Win32/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/Win32/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/Win32/glew32.lib + ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/${BUILD_ARCH}/glew32.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) file(INSTALL -- cgit v1.2.3 From de5668743f3fb4a69c908e3f29a2b39bdaca2cfb Mon Sep 17 00:00:00 2001 From: sdcb Date: Thu, 22 Sep 2016 14:28:12 +0800 Subject: add user-friendly message when request install arm-uwp. --- ports/glew/portfile.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index bc95503bc..fcb2731ec 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -6,6 +6,15 @@ vcpkg_download_distfile(ARCHIVE_FILE ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) +IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") + SET(BUILD_ARCH "Win32") +ELSEIF(TRIPLET_SYSTEM_ARCH MATCHES "arm") + MESSAGE(FATAL_ERROR, " ARM is currently not supported.") + RETURN() +ELSE() + SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) +ENDIF() + if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14.vcxproj) message(STATUS "Upgrading projects") file(READ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared.vcxproj PROJ) @@ -26,11 +35,6 @@ vcpkg_build_msbuild( ) message(STATUS "Installing") -IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") - SET(BUILD_ARCH "Win32") -ELSE() - SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) -ENDIF() file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.dll -- cgit v1.2.3