Browse Source

Platform: properly link all dependencies of AndroidApplication.

pull/297/head
Vladimír Vondruš 8 years ago
parent
commit
5e36f65149
  1. 5
      doc/changelog.dox
  2. 6
      src/Magnum/Platform/CMakeLists.txt

5
doc/changelog.dox

@ -86,6 +86,11 @@ r<Player<T, K>>>)
compared to before. It's now also possible to reuse the internal state for
batch processing.
@subsection changelog-latest-buildsystem Build system
- The `Magnum::AndroidApplication` target was missing a few dependency
libraries when Magnum was used as a CMake subproject
@subsection changelog-latest-bugfixes Bug fixes
- Fixed @ref Platform::Sdl2Application and @ref Platform::GlfwApplication to

6
src/Magnum/Platform/CMakeLists.txt

@ -72,6 +72,7 @@ if(WITH_ANDROIDAPPLICATION)
message(FATAL_ERROR "AndroidApplication is available only when targeting Android. Set WITH_ANDROIDAPPLICATION to OFF to skip building it.")
endif()
find_package(EGL REQUIRED)
set(NEED_EGLCONTEXT 1)
set(MagnumAndroidApplication_SRCS
@ -101,7 +102,10 @@ if(WITH_ANDROIDAPPLICATION)
FOLDER "Magnum/Platform")
# Assuming that PIC is not needed because the Application lib is always
# linked to the executable and not to any intermediate shared lib
target_link_libraries(MagnumAndroidApplication PUBLIC MagnumGL)
target_link_libraries(MagnumAndroidApplication PUBLIC
MagnumGL
android
EGL::EGL)
install(FILES ${MagnumAndroidApplication_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform)
install(TARGETS MagnumAndroidApplication

Loading…
Cancel
Save