ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

modules: explicitly link to Emscripten GL and OpenAL libraries. 

Emscripten's MINIMAL_RUNTIME requires -lGL or -lopenal to be specified
(the default does that implicitly). It doesn't hurt to do that every
time and it makes the Find modules slightly simpler.
pull/364/head
Vladimír Vondruš 7 years ago
parent
bc95e35328
commit
fa50929c78
5 changed files with 58 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      doc/changelog.dox
  2. 33
      modules/FindEGL.cmake
  3. 12
      modules/FindOpenAL.cmake
  4. 34
      modules/FindOpenGLES2.cmake
  5. 34
      modules/FindOpenGLES3.cmake

3
doc/changelog.dox
Unescape View File

@ -396,6 +396,9 @@ See also:
scripts and `FindMagnum.cmake` always forced GLVND) scripts and `FindMagnum.cmake` always forced GLVND)
- `FindMagnum.cmake` now correctly finds debug versions of statically built - `FindMagnum.cmake` now correctly finds debug versions of statically built
plugins when using Vcpkg plugins when using Vcpkg
- `FindEGL.cmake`, `FindOpenAL.cmake`, `FindOpenGLES2.cmake` and
`FindOpenGLES3.cmake` now explicitly link to the `GL` and `openal`
libraries on Emscripten, which is needed for `MINIMAL_BUILD`
- Fixed linking of static `Any*` plugins when the libraries are otherwise - Fixed linking of static `Any*` plugins when the libraries are otherwise
build as dynamic build as dynamic
- Removed mention of the outdated Ubuntu PPA from @ref building as it doesn't - Removed mention of the outdated Ubuntu PPA from @ref building as it doesn't

33
modules/FindEGL.cmake
Unescape View File

@ -38,8 +38,11 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# Library # Under Emscripten, GL is linked implicitly. With MINIMAL_RUNTIME you need to
if(NOT CORRADE_TARGET_EMSCRIPTEN) # specify -lGL. Simply set the library name to that.
if(CORRADE_TARGET_EMSCRIPTEN)
set(EGL_LIBRARY GL CACHE STRING "Path to a library." FORCE)
else()
find_library(EGL_LIBRARY NAMES find_library(EGL_LIBRARY NAMES
EGL EGL
@ -48,7 +51,6 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN)
# On iOS a part of OpenGLES # On iOS a part of OpenGLES
OpenGLES) OpenGLES)
set(EGL_LIBRARY_NEEDED EGL_LIBRARY)
endif() endif()
# Include dir # Include dir
@ -60,24 +62,21 @@ find_path(EGL_INCLUDE_DIR NAMES
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EGL DEFAULT_MSG find_package_handle_standard_args(EGL DEFAULT_MSG
${EGL_LIBRARY_NEEDED} EGL_LIBRARY
EGL_INCLUDE_DIR) EGL_INCLUDE_DIR)
if(NOT TARGET EGL::EGL) if(NOT TARGET EGL::EGL)
if(EGL_LIBRARY_NEEDED) # Work around BUGGY framework support on macOS. Do this also in case of
# Work around BUGGY framework support on macOS # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # http://public.kitware.com/pipermail/cmake/2016-April/063179.html
if(APPLE AND ${EGL_LIBRARY} MATCHES "\\.framework$") if((APPLE AND ${EGL_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(EGL::EGL INTERFACE IMPORTED)
set_property(TARGET EGL::EGL APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${EGL_LIBRARY})
else()
add_library(EGL::EGL UNKNOWN IMPORTED)
set_property(TARGET EGL::EGL PROPERTY
IMPORTED_LOCATION ${EGL_LIBRARY})
endif()
else()
add_library(EGL::EGL INTERFACE IMPORTED) add_library(EGL::EGL INTERFACE IMPORTED)
set_property(TARGET EGL::EGL APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${EGL_LIBRARY})
else()
add_library(EGL::EGL UNKNOWN IMPORTED)
set_property(TARGET EGL::EGL PROPERTY
IMPORTED_LOCATION ${EGL_LIBRARY})
endif() endif()
set_target_properties(EGL::EGL PROPERTIES set_target_properties(EGL::EGL PROPERTIES

12
modules/FindOpenAL.cmake
Unescape View File

@ -90,8 +90,9 @@
# This version is modified for Magnum and was forked from # This version is modified for Magnum and was forked from
# https://github.com/Kitware/CMake/blob/v3.6.1/Modules/FindOpenAL.cmake # https://github.com/Kitware/CMake/blob/v3.6.1/Modules/FindOpenAL.cmake
# The file was modified to add a new path suffix for finding OpenAL for # The file was modified to add a new path suffix for finding OpenAL for
# Emscripten on macOS and, in case of Emscripten, the library is not looked for # Emscripten on macOS. Additionally, in case of Emscripten, there's no library
# as it is linked in implicitly. # to find but instead one says -lopenal (and if MINIMAL_RUNTIME is not
# specified, this is implicit).
find_path(OPENAL_INCLUDE_DIR al.h find_path(OPENAL_INCLUDE_DIR al.h
HINTS HINTS
@ -115,7 +116,9 @@ else()
set(_OpenAL_ARCH_DIR libs/Win32) set(_OpenAL_ARCH_DIR libs/Win32)
endif() endif()
if(NOT CORRADE_TARGET_EMSCRIPTEN) if(CORRADE_TARGET_EMSCRIPTEN)
set(OPENAL_LIBRARY openal CACHE STRING "Path to a library." FORCE)
else()
find_library(OPENAL_LIBRARY find_library(OPENAL_LIBRARY
NAMES OpenAL al openal OpenAL32 NAMES OpenAL al openal OpenAL32
HINTS HINTS
@ -130,7 +133,6 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN)
/opt /opt
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
) )
set(OPENAL_LIBRARY_NEEDED OPENAL_LIBRARY)
endif() endif()
unset(_OpenAL_ARCH_DIR) unset(_OpenAL_ARCH_DIR)
@ -138,6 +140,6 @@ unset(_OpenAL_ARCH_DIR)
# handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG ${OPENAL_LIBRARY_NEEDED} OPENAL_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
mark_as_advanced(OPENAL_LIBRARY OPENAL_INCLUDE_DIR) mark_as_advanced(OPENAL_LIBRARY OPENAL_INCLUDE_DIR)

34
modules/FindOpenGLES2.cmake
Unescape View File

@ -38,9 +38,11 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# In Emscripten OpenGL ES 2 is linked automatically, thus no need to find the # Under Emscripten, GL is linked implicitly. With MINIMAL_RUNTIME you need to
# library. # specify -lGL. Simply set the library name to that.
if(NOT CORRADE_TARGET_EMSCRIPTEN) if(CORRADE_TARGET_EMSCRIPTEN)
set(OPENGLES2_LIBRARY GL CACHE STRING "Path to a library." FORCE)
else()
find_library(OPENGLES2_LIBRARY NAMES find_library(OPENGLES2_LIBRARY NAMES
GLESv2 GLESv2
@ -49,7 +51,6 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN)
# iOS # iOS
OpenGLES) OpenGLES)
set(OPENGLES2_LIBRARY_NEEDED OPENGLES2_LIBRARY)
endif() endif()
# Include dir # Include dir
@ -61,24 +62,21 @@ find_path(OPENGLES2_INCLUDE_DIR NAMES
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG
${OPENGLES2_LIBRARY_NEEDED} OPENGLES2_LIBRARY
OPENGLES2_INCLUDE_DIR) OPENGLES2_INCLUDE_DIR)
if(NOT TARGET OpenGLES2::OpenGLES2) if(NOT TARGET OpenGLES2::OpenGLES2)
if(OPENGLES2_LIBRARY_NEEDED) # Work around BUGGY framework support on macOS. Do this also in case of
# Work around BUGGY framework support on macOS # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # http://public.kitware.com/pipermail/cmake/2016-April/063179.html
if(CORRADE_TARGET_APPLE AND ${OPENGLES2_LIBRARY} MATCHES "\\.framework$") if((CORRADE_TARGET_APPLE AND ${OPENGLES2_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED)
set_property(TARGET OpenGLES2::OpenGLES2 APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${OPENGLES2_LIBRARY})
else()
add_library(OpenGLES2::OpenGLES2 UNKNOWN IMPORTED)
set_property(TARGET OpenGLES2::OpenGLES2 PROPERTY
IMPORTED_LOCATION ${OPENGLES2_LIBRARY})
endif()
else()
add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED) add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED)
set_property(TARGET OpenGLES2::OpenGLES2 APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${OPENGLES2_LIBRARY})
else()
add_library(OpenGLES2::OpenGLES2 UNKNOWN IMPORTED)
set_property(TARGET OpenGLES2::OpenGLES2 PROPERTY
IMPORTED_LOCATION ${OPENGLES2_LIBRARY})
endif() endif()
set_property(TARGET OpenGLES2::OpenGLES2 PROPERTY set_property(TARGET OpenGLES2::OpenGLES2 PROPERTY

34
modules/FindOpenGLES3.cmake
Unescape View File

@ -38,9 +38,11 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# In Emscripten OpenGL ES 3 is linked automatically, thus no need to find the # Under Emscripten, GL is linked implicitly. With MINIMAL_RUNTIME you need to
# library. # specify -lGL. Simply set the library name to that.
if(NOT CORRADE_TARGET_EMSCRIPTEN) if(CORRADE_TARGET_EMSCRIPTEN)
set(OPENGLES3_LIBRARY GL CACHE STRING "Path to a library." FORCE)
else()
find_library(OPENGLES3_LIBRARY NAMES find_library(OPENGLES3_LIBRARY NAMES
GLESv3 GLESv3
@ -53,7 +55,6 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN)
# iOS # iOS
OpenGLES) OpenGLES)
set(OPENGLES3_LIBRARY_NEEDED OPENGLES3_LIBRARY)
endif() endif()
# Include dir # Include dir
@ -65,24 +66,21 @@ find_path(OPENGLES3_INCLUDE_DIR NAMES
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args("OpenGLES3" DEFAULT_MSG find_package_handle_standard_args("OpenGLES3" DEFAULT_MSG
${OPENGLES3_LIBRARY_NEEDED} OPENGLES3_LIBRARY
OPENGLES3_INCLUDE_DIR) OPENGLES3_INCLUDE_DIR)
if(NOT TARGET OpenGLES3::OpenGLES3) if(NOT TARGET OpenGLES3::OpenGLES3)
if(OPENGLES3_LIBRARY_NEEDED) # Work around BUGGY framework support on macOS. Do this also in case of
# Work around BUGGY framework support on macOS # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # http://public.kitware.com/pipermail/cmake/2016-April/063179.html
if(CORRADE_TARGET_APPLE AND ${OPENGLES3_LIBRARY} MATCHES "\\.framework$") if((CORRADE_TARGET_APPLE AND ${OPENGLES3_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED)
set_property(TARGET OpenGLES3::OpenGLES3 APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${OPENGLES3_LIBRARY})
else()
add_library(OpenGLES3::OpenGLES3 UNKNOWN IMPORTED)
set_property(TARGET OpenGLES3::OpenGLES3 PROPERTY
IMPORTED_LOCATION ${OPENGLES3_LIBRARY})
endif()
else()
add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED) add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED)
set_property(TARGET OpenGLES3::OpenGLES3 APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${OPENGLES3_LIBRARY})
else()
add_library(OpenGLES3::OpenGLES3 UNKNOWN IMPORTED)
set_property(TARGET OpenGLES3::OpenGLES3 PROPERTY
IMPORTED_LOCATION ${OPENGLES3_LIBRARY})
endif() endif()
set_property(TARGET OpenGLES3::OpenGLES3 PROPERTY set_property(TARGET OpenGLES3::OpenGLES3 PROPERTY

Write Preview
Loading…
Cancel
Save