diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index a3b33eb85..4cfaa9393 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -318,6 +318,7 @@ if(NOT MAGNUM_TARGET_GLES) endif() # Installation dirs +include(CorradeLibSuffix) set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(MAGNUM_PLUGINS_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum) set(MAGNUM_PLUGINS_FONT_INSTALL_DIR ${MAGNUM_PLUGINS_INSTALL_DIR}/fonts) diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt index 5ff61f660..9cd8640a2 100644 --- a/src/Platform/CMakeLists.txt +++ b/src/Platform/CMakeLists.txt @@ -84,9 +84,9 @@ if(WITH_WINDOWLESSNACLAPPLICATION) install(TARGETS MagnumWindowlessNaClApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) endif() -# JavaScript stuff for NaCl +# JavaScript and CSS stuff for NaCl if(WITH_NACLAPPLICATION OR WITH_WINDOWLESSNACLAPPLICATION) - install(FILES NaClApplication.js DESTINATION ${MAGNUM_DATA_INSTALL_DIR}) + install(FILES NaClApplication.js NaClApplication.css DESTINATION ${MAGNUM_DATA_INSTALL_DIR}) endif() # GLX application diff --git a/src/Platform/magnum-info-nacl.html b/src/Platform/magnum-info-nacl.html index 4a3af2251..b425ce48f 100644 --- a/src/Platform/magnum-info-nacl.html +++ b/src/Platform/magnum-info-nacl.html @@ -5,6 +5,7 @@