diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-08-29 17:00:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-25 07:24:19 +0000 |
| commit | 2fd3b44697fd94a799fb31550f4a3c6cf547b028 (patch) | |
| tree | c1839f17713b54f651c1c481ff30dacc21d6edd5 | |
| parent | 4b592ba90c4a9da3bd5707e70c9d0e25891bda25 (diff) | |
Fix GLESv2 linkage with Emscripten
There's no library to link against and the headers are in the system, so
we can create a synthetic import library after verifying the
compilation.
Change-Id: I9baa32cfe06f2f48adf066d558aa69646143efd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
| -rw-r--r-- | cmake/FindGLESv2.cmake | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake index a4af6cbbbc..02df910285 100644 --- a/cmake/FindGLESv2.cmake +++ b/cmake/FindGLESv2.cmake @@ -1,14 +1,18 @@ include(CheckCXXSourceCompiles) -find_library(GLESv2_LIBRARY NAMES GLESv2) -find_path(GLESv2_INCLUDE_DIR NAMES "GLES2/gl2.h" DOC "The OpenGLES 2 include path") - -set(_libraries "${CMAKE_REQUIRED_LIBRARIES}") -list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}") -set(_includes "${CMAKE_REQUIRED_INCLUDES}") -list(APPEND CMAKE_REQUIRED_INCLUDES "${GLESv2_INCLUDE_DIR}") - -check_cxx_source_compiles(" +# No library linkage is necessary to use GLESv2 with Emscripten. The headers are also +# system headers, so we don't need to search for them. +if(EMSCRIPTEN) + set(HAVE_GLESv2 ON) +else() + find_library(GLESv2_LIBRARY NAMES GLESv2) + find_path(GLESv2_INCLUDE_DIR NAMES "GLES2/gl2.h" DOC "The OpenGLES 2 include path") + set(_libraries "${CMAKE_REQUIRED_LIBRARIES}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}") + set(_includes "${CMAKE_REQUIRED_INCLUDES}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${GLESv2_INCLUDE_DIR}") + + check_cxx_source_compiles(" #ifdef __APPLE__ # include <OpenGLES/ES2/gl.h> #else @@ -21,20 +25,27 @@ int main(int argc, char *argv[]) { glClear(GL_COLOR_BUFFER_BIT); }" HAVE_GLESv2) -set(CMAKE_REQUIRED_LIBRARY "${_libraries}") -unset(_libraries) -set(CMAKE_REQUIRED_INCLUDES "${_includes}") -unset(_includes) + set(CMAKE_REQUIRED_LIBRARY "${_libraries}") + unset(_libraries) + set(CMAKE_REQUIRED_INCLUDES "${_includes}") + unset(_includes) + set(package_args GLESv2_INCLUDE_DIR GLESv2_LIBRARY HAVE_GLESv2) +endif() +list(APPEND package_args HAVE_GLESv2) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GLESv2 DEFAULT_MSG GLESv2_INCLUDE_DIR GLESv2_LIBRARY HAVE_GLESv2) +find_package_handle_standard_args(GLESv2 DEFAULT_MSG ${package_args}) -mark_as_advanced(GLESv2_INCLUDE_DIR GLESv2_LIBRARY HAVE_GLESv2) +mark_as_advanced(${package_args}) if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2) - add_library(GLESv2::GLESv2 UNKNOWN IMPORTED) - set_target_properties(GLESv2::GLESv2 PROPERTIES - IMPORTED_LOCATION "${GLESv2_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}") + if(EMSCRIPTEN) + add_library(GLESv2::GLESv2 INTERFACE IMPORTED) + else() + add_library(GLESv2::GLESv2 UNKNOWN IMPORTED) + set_target_properties(GLESv2::GLESv2 PROPERTIES + IMPORTED_LOCATION "${GLESv2_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}") + endif() endif() |