diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-07-06 12:42:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 12:42:35 -0700 |
| commit | 8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3 (patch) | |
| tree | d13210931c83678f59a22c6f2614acdf6d36895c /ports/opengl | |
| parent | 58ff68ae41093573f56fae580a7ef6b339abe14e (diff) | |
| download | vcpkg-8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3.tar.gz vcpkg-8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3.zip | |
[opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (#12232)
Also delete vcpkg_get_program_files_32_bit because it was used in only one place.
Resolves #8288
Obsoletes #11421, #11261, #8329
Diffstat (limited to 'ports/opengl')
| -rw-r--r-- | ports/opengl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opengl/portfile.cmake | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL index d8408e722..74eff9302 100644 --- a/ports/opengl/CONTROL +++ b/ports/opengl/CONTROL @@ -1,3 +1,3 @@ Source: opengl -Version: 0.0-6 +Version: 0.0-7 Description: Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index 63b4c0ffa..6d27810cb 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -1,17 +1,14 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT) vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") - set(LIBGLFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") - set(LIBGLUFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") - set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Include\\${WINDOWS_SDK}\\um") + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\${WINDOWS_SDK}\\um") elseif(WINDOWS_SDK MATCHES "8.") - set(LIBGLFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") - set(LIBGLUFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") - set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Include\\um") + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\um") else() message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") endif() |