Fix ignored OpenGLES2 include path and cmake warning

sfan5 · sfan5 · commit 52c0384bd1c9 · 2021-04-16T23:39:16.000+02:00
diff --git 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
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ else()`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`include(FindPackageHandleStandardArgs)`
`45`		`- find_package_handle_standard_args(OPENGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)`
	`45`	`+ find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)`
`46`	`46`
`47`	`47`	`find_path(EGL_INCLUDE_DIR EGL/egl.h`
`48`	`48`	`PATHS /usr/openwin/share/include`
`@@ -59,7 +59,6 @@ else()`
`59`	`59`	`/usr/lib`
`60`	`60`	`)`
`61`	`61`
`62`		`- include(FindPackageHandleStandardArgs)`
`63`	`62`	`find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)`
`64`	`63`	`endif()`
`65`	`64`