aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNemirtingas <9432037+Nemirtingas@users.noreply.github.com>2020-12-01 23:12:13 +0100
committerGitHub <noreply@github.com>2020-12-01 14:12:13 -0800
commit18c93abcb479a52e6b4b8cc3095c12f4c71ce3f3 (patch)
treeed9901ad415bd53a664d4a98e760c3d2b6523a3c
parent00553d0269794e7358e55087f550bb92ebf01c89 (diff)
downloadvcpkg-18c93abcb479a52e6b4b8cc3095c12f4c71ce3f3.tar.gz
vcpkg-18c93abcb479a52e6b4b8cc3095c12f4c71ce3f3.zip
[opengl] port path fix when crosscompiling (#14724)
* Update portfile to use native file path. Fixes cross-compilation paths. * Update portfile.cmake * Update CONTROL * Update ports/opengl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
-rw-r--r--ports/opengl/CONTROL3
-rw-r--r--ports/opengl/portfile.cmake41
2 files changed, 26 insertions, 18 deletions
diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL
index 74eff9302..625d51c35 100644
--- a/ports/opengl/CONTROL
+++ b/ports/opengl/CONTROL
@@ -1,3 +1,4 @@
Source: opengl
-Version: 0.0-7
+Version: 0.0
+Port-Version: 8
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 6d27810cb..72625fa15 100644
--- a/ports/opengl/portfile.cmake
+++ b/ports/opengl/portfile.cmake
@@ -2,13 +2,13 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
vcpkg_get_windows_sdk(WINDOWS_SDK)
if (WINDOWS_SDK MATCHES "10.")
- 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")
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH)
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH)
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH)
elseif(WINDOWS_SDK MATCHES "8.")
- 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")
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH)
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH)
+ file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH)
else()
message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}")
endif()
@@ -21,33 +21,40 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}")
endif()
+ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl" INCLUDEGLPATH)
+ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH)
+ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib" RELEASELIBPATH)
+ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib" DEBUGLIBPATH)
+ file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h" GLGLHPATH)
+ file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h" GLGLUHPATH)
+
file(MAKE_DIRECTORY
- ${CURRENT_PACKAGES_DIR}/include/gl
- ${CURRENT_PACKAGES_DIR}/share/opengl
+ "${INCLUDEGLPATH}"
+ "${SHAREOPENGLPATH}"
)
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY
- ${CURRENT_PACKAGES_DIR}/lib
+ "${RELEASELIBPATH}"
)
endif()
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY
- ${CURRENT_PACKAGES_DIR}/debug/lib
+ "${DEBUGLIBPATH}"
)
endif()
file(COPY
- "${HEADERSPATH}\\gl\\GL.h"
- "${HEADERSPATH}\\gl\\GLU.h"
- DESTINATION ${CURRENT_PACKAGES_DIR}/include/gl
+ "${GLGLHPATH}"
+ "${GLGLUHPATH}"
+ DESTINATION "${INCLUDEGLPATH}"
)
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
- file(COPY ${LIBGLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
- file(COPY ${LIBGLUFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+ file(COPY ${LIBGLFILEPATH} DESTINATION "${RELEASELIBPATH}")
+ file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}")
endif()
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
- file(COPY ${LIBGLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
- file(COPY ${LIBGLUFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+ file(COPY ${LIBGLFILEPATH} DESTINATION "${DEBUGLIBPATH}")
+ file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}")
endif()
if (WINDOWS_SDK MATCHES "10.")