aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Warren <s.warren@garvan.org.au>2019-03-31 16:18:23 +1100
committerPhil Christensen <philc@microsoft.com>2019-03-30 22:18:23 -0700
commit55eeb17c66af42a4c0dd2476897bdadca029af74 (patch)
treef2fe4c5cf7a933152e7d6fd93466d08bb0122dc8
parent5a9b14c97823c5402c62184246c8a6856da5d224 (diff)
downloadvcpkg-55eeb17c66af42a4c0dd2476897bdadca029af74.tar.gz
vcpkg-55eeb17c66af42a4c0dd2476897bdadca029af74.zip
[glew] Do not build utilities (#5859)
* [glew] Do not build utilities
-rw-r--r--ports/glew/CONTROL6
-rw-r--r--ports/glew/portfile.cmake11
2 files changed, 7 insertions, 10 deletions
diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL
index ecf948c5d..45af04091 100644
--- a/ports/glew/CONTROL
+++ b/ports/glew/CONTROL
@@ -1,3 +1,3 @@
-Source: glew
-Version: 2.1.0-1
-Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
+Source: glew
+Version: 2.1.0-2
+Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake
index 45f711f77..1e2080458 100644
--- a/ports/glew/portfile.cmake
+++ b/ports/glew/portfile.cmake
@@ -3,7 +3,7 @@ include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0)
# Don't change to vcpkg_from_github! The github-auto-generated archives are missing some files.
-# More info: https://github.com/nigels-com/glew/issues/31
+# More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13
vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz"
FILENAME "glew-2.1.0.tgz"
@@ -13,7 +13,9 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/build/cmake
-)
+ OPTIONS
+ -DBUILD_UTILS=OFF
+ )
vcpkg_install_cmake()
@@ -40,11 +42,6 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib)
endif()
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/visualinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/visualinfo.exe)
-
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)