aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexej Harm <alexej.h@xiphos.de>2017-11-21 00:33:06 +0100
committerRobert Schumacher <roschuma@microsoft.com>2017-11-20 15:33:06 -0800
commit4415ff5c16d96928a80fa17d6f7028bc9023ebd8 (patch)
tree0815350d17fc916e1750e794a8f755cb93e26ecf
parent1a6d0f5611882618f9179898448ca56770ff2ab0 (diff)
downloadvcpkg-4415ff5c16d96928a80fa17d6f7028bc9023ebd8.tar.gz
vcpkg-4415ff5c16d96928a80fa17d6f7028bc9023ebd8.zip
[angle] Add CMake package with modules. (#2223)
* added angle cmake config * bumped angle package version * [angle] Add unofficial cmake targets
-rw-r--r--ports/angle/CMakeLists.txt6
-rw-r--r--ports/angle/CONTROL2
-rw-r--r--ports/angle/portfile.cmake4
3 files changed, 10 insertions, 2 deletions
diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
index 5a4c05359..53fff2223 100644
--- a/ports/angle/CMakeLists.txt
+++ b/ports/angle/CMakeLists.txt
@@ -178,6 +178,7 @@ target_compile_definitions(libGLESv2
-DGL_APICALL=
-DEGLAPI=
)
+target_include_directories(libGLESv2 PUBLIC "$<INSTALL_INTERFACE:include>")
##########
# libEGL
@@ -188,13 +189,16 @@ add_library(libEGL
"src/libEGL/resource.h"
)
target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
+target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>")
-install(TARGETS libEGL libGLESv2
+install(TARGETS libEGL libGLESv2 EXPORT ANGLEExport
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
+install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
+
if(NOT DISABLE_INSTALL_HEADERS)
install(
DIRECTORY include/
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
index 38f8c7c60..12f912ac8 100644
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@@ -1,4 +1,4 @@
Source: angle
-Version: 2017-06-14-8d471f-2
+Version: 2017-06-14-8d471f-4
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
index ab7ebd828..e21aa83bc 100644
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@@ -31,6 +31,10 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/angle ${CURRENT_PACKAGES_DIR}/share/unofficial-angle)
+
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)