aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-04-16 23:39:16 +0200
committersfan5 <sfan5@live.de>2021-04-16 23:39:16 +0200
commit52c0384bd1c9f564f7a6deab93e560dc49ff8915 (patch)
tree04bc70e8fb784f81ce42091b4b1a7b40adc04158
parenta106bfd456509b676ccba0ac9bef75c214819028 (diff)
downloadminetest-52c0384bd1c9f564f7a6deab93e560dc49ff8915.tar.gz
minetest-52c0384bd1c9f564f7a6deab93e560dc49ff8915.tar.bz2
minetest-52c0384bd1c9f564f7a6deab93e560dc49ff8915.zip
Fix ignored OpenGLES2 include path and cmake warning
-rw-r--r--cmake/Modules/FindOpenGLES2.cmake3
-rw-r--r--src/CMakeLists.txt4
2 files changed, 5 insertions, 2 deletions
diff --git a/cmake/Modules/FindOpenGLES2.cmake b/cmake/Modules/FindOpenGLES2.cmake
index a47126705..ce04191dd 100644
--- a/cmake/Modules/FindOpenGLES2.cmake
+++ b/cmake/Modules/FindOpenGLES2.cmake
@@ -42,7 +42,7 @@ else()
)
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(OPENGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
+ find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
find_path(EGL_INCLUDE_DIR EGL/egl.h
PATHS /usr/openwin/share/include
@@ -59,7 +59,6 @@ else()
/usr/lib
)
- include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26441063f..16b5bf991 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -513,6 +513,10 @@ include_directories(
${PROJECT_SOURCE_DIR}/script
)
+if(ENABLE_GLES)
+ include_directories(${OPENGLES2_INCLUDE_DIR} ${EGL_INCLUDE_DIR})
+endif()
+
if(USE_GETTEXT)
include_directories(${GETTEXT_INCLUDE_DIR})
endif()