diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-22 11:00:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 11:00:17 -0700 |
| commit | 751661a11a9700ad42e4279343b0b84797e2e987 (patch) | |
| tree | 29ccd087dbe8c07d3c903f5ccc261037c7e364dc | |
| parent | 764afd8619f6d236fa56b77de9793120a25c4fb9 (diff) | |
| parent | de5668743f3fb4a69c908e3f29a2b39bdaca2cfb (diff) | |
| download | vcpkg-751661a11a9700ad42e4279343b0b84797e2e987.tar.gz vcpkg-751661a11a9700ad42e4279343b0b84797e2e987.zip | |
Merge pull request #65 from sdcb/fix_11
fix Glew:x64-windows install failure #11.
| -rw-r--r-- | ports/glew/portfile.cmake | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 320db8043..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,22 +35,23 @@ vcpkg_build_msbuild( ) message(STATUS "Installing") + 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 |