diff options
| author | Ninetainedo <ninetainedo@gmail.com> | 2016-09-22 22:15:14 +0200 |
|---|---|---|
| committer | Ninetainedo <ninetainedo@gmail.com> | 2016-09-22 22:15:14 +0200 |
| commit | cbd2f0ec0f7312df2c0da9f3a64e5ae988159d37 (patch) | |
| tree | 8682ccb7258a3f831b645049fb891cfd3bea82f7 /ports/glew | |
| parent | fc2608399580639f54da9e01af6ce7e161e35475 (diff) | |
| parent | db3713779cc0aa0e9d80fa0d4e2bd4b3e0c4eaf0 (diff) | |
| download | vcpkg-cbd2f0ec0f7312df2c0da9f3a64e5ae988159d37.tar.gz vcpkg-cbd2f0ec0f7312df2c0da9f3a64e5ae988159d37.zip | |
Merge remote-tracking branch 'refs/remotes/Microsoft/master' into Use-SHA512-instead-of-MD5
Diffstat (limited to 'ports/glew')
| -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 f6c3b7da5..273d7041b 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 |