diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-30 21:05:51 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-02 22:16:47 -0700 |
| commit | b08e78b07d4340a537f8d1470137883775a8902a (patch) | |
| tree | 98e3e558875e42d4c0a4cef8c9e0cbbad720f25e /ports/gl3w | |
| parent | 3c16addc8c8e6516a4ee4edcb11c1fc428d38b96 (diff) | |
| download | vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.tar.gz vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.zip | |
[cmark][gl3w][libpopt][libraw][libssh][live555] Fixes, mostly around changing download locations.
Diffstat (limited to 'ports/gl3w')
| -rw-r--r-- | ports/gl3w/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | ports/gl3w/CONTROL | 1 | ||||
| -rw-r--r-- | ports/gl3w/portfile.cmake | 10 |
3 files changed, 11 insertions, 19 deletions
diff --git a/ports/gl3w/CMakeLists.txt b/ports/gl3w/CMakeLists.txt index 30a94eddb..41f75b21b 100644 --- a/ports/gl3w/CMakeLists.txt +++ b/ports/gl3w/CMakeLists.txt @@ -1,25 +1,24 @@ cmake_minimum_required(VERSION 3.9) project(gl3w C) -set(HEADER_FILES - "include/GL/gl3w.h" - "include/GL/glcorearb.h" -) - find_package(OpenGL REQUIRED) +find_path(GLCOREARB_H NAMES GL/glcorearb.h) add_library(gl3w src/gl3w.c) -target_include_directories(gl3w PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> +target_include_directories(gl3w + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + $<INSTALL_INTERFACE:include> + PRIVATE + ${GLCOREARB_H} + ${OPENGL_INCLUDE_DIR} ) if(BUILD_SHARED_LIBS) target_compile_definitions(gl3w PRIVATE "-DGL3W_API=__declspec(dllexport)") endif() -target_include_directories(gl3w PRIVATE ${OPENGL_INCLUDE_DIR}) target_link_libraries(gl3w PRIVATE ${OPENGL_LIBRARIES}) install(TARGETS gl3w @@ -37,5 +36,5 @@ install( ) if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY include/GL DESTINATION include) + install(FILES include/GL/gl3w.h DESTINATION include/GL) endif() diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL index 10a2c2b76..e8f6fdae1 100644 --- a/ports/gl3w/CONTROL +++ b/ports/gl3w/CONTROL @@ -1,3 +1,4 @@ Source: gl3w Version: 8f7f459d Description: Simple OpenGL core profile loading +Build-Depends: opengl-registry diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index bb3f245c9..a5a7825b7 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -9,15 +9,7 @@ vcpkg_from_github( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_download_distfile( - GLCOREARB_H - URLS "http://www.opengl.org/registry/api/GL/glcorearb.h" - FILENAME "glcorearb-2018-02-27.h" - SHA512 02c3672606e6360f2e1e8335fe581bc2d2b3d518b0f24b0c327006a70de07261dace4b53b13e93029a8eb2af43bcba904c4392f2c35ac512c7f278534ef8eb5d -) - -file(INSTALL ${GLCOREARB_H} DESTINATION ${SOURCE_PATH}/include/GL RENAME glcorearb.h) +file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} |