From 6ae111a298f1d3706583d0df312afd5b854d8abf Mon Sep 17 00:00:00 2001 From: Reiko Asakura Date: Sat, 20 Mar 2021 16:32:24 -0400 Subject: Change GLES2 header install path Avoids conflict with other GL header providers. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8457489..5a78c1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,23 +36,23 @@ ExternalProject_Add(opengl-registry URL https://github.com/KhronosGroup/OpenGL-Registry/archive/2afca877b25ec2c7f19ddcba21a8627b9fa8e026.tar.gz URL_HASH SHA256=d7447748ac3a10c9c6324e2ee980b3b0d6f75f8665d0d4055b1afd1aa3f5b67d EXCLUDE_FROM_ALL TRUE - INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/vdsuite/user/piglet CONFIGURE_COMMAND "" BUILD_COMMAND "" - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory /api/GLES2 /include/vdsuite/user/GLES2 + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory /api/GLES2 /GLES2 ) ExternalProject_Add(egl-registry URL https://github.com/KhronosGroup/EGL-Registry/archive/d42c684f61828e3ce18533f1c6893b79980e6acc.tar.gz URL_HASH SHA256=02ce918b4c9c65b5af1924330a17f3c7fbccfd87869a5c87b25d7c7c593a3d8b EXCLUDE_FROM_ALL TRUE - INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/vdsuite/user/piglet PATCH_COMMAND patch --forward --strip=1 --input=${CMAKE_CURRENT_SOURCE_DIR}/patches/egl-registry.patch CONFIGURE_COMMAND "" BUILD_COMMAND ${CMAKE_COMMAND} -E chdir /api python3 genheaders.py -registry egl.xml EGL/egl.h COMMAND ${CMAKE_COMMAND} -E chdir /api python3 genheaders.py -registry egl.xml EGL/eglext.h - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory /api/EGL /include/vdsuite/user/EGL - COMMAND ${CMAKE_COMMAND} -E copy_directory /api/KHR /include/vdsuite/user/KHR + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory /api/EGL /EGL + COMMAND ${CMAKE_COMMAND} -E copy_directory /api/KHR /KHR ) # Static libraries -- cgit v1.2.3