Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2018-04-12 15:33:27 +02:00
commit 05fee379ad
4 changed files with 20 additions and 9 deletions

View file

@ -613,6 +613,11 @@ set(lspSOURCES
${SOURCE_DIR}/lsp/minified.js
)
if (NOT DEFINED NOGA )
list(APPEND lspSOURCES ${SOURCE_DIR}/lsp/analytics.js)
endif()
add_custom_command(OUTPUT ${BINARY_DIR}/generated/server.html
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR="${SOURCE_DIR}" -DlspSOURCES="${lspSOURCES}" -P ${SOURCE_DIR}/CMakeServHtml.txt
DEPENDS ${lspSOURCES} ${SOURCE_DIR}/CMakeServHtml.txt ${SOURCE_DIR}/lsp/main.css ${SOURCE_DIR}/lsp/header.html ${SOURCE_DIR}/lsp/footer.html