diff Samples/WebAssembly/CMakeLists.txt @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents 0c0fc20a6902
children 50cd372e2460 6073c980323a
line wrap: on
line diff
--- a/Samples/WebAssembly/CMakeLists.txt	Wed Jun 19 17:36:33 2019 +0200
+++ b/Samples/WebAssembly/CMakeLists.txt	Mon Jun 24 14:35:00 2019 +0200
@@ -13,6 +13,7 @@
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ASSERTIONS=1 -s DISABLE_EXCEPTION_CATCHING=0")
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXIT_RUNTIME=1")
 
 
 #####################################################################
@@ -59,6 +60,10 @@
 
 include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/OrthancStoneConfiguration.cmake)
 
+add_definitions(
+  -DORTHANC_ENABLE_LOGGING_PLUGIN=0
+  )
+
 
 #####################################################################
 ## Build the samples
@@ -68,22 +73,43 @@
   ${ORTHANC_STONE_SOURCES}
   )
 
-add_executable(BasicScene
-  BasicScene.cpp
-  )
+
+if (ON)
+  add_executable(BasicScene
+    BasicScene.cpp
+    )
+
+  target_link_libraries(BasicScene OrthancStone)
+
+  install(
+    TARGETS BasicScene
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
+    )
+endif()
 
-target_link_libraries(BasicScene OrthancStone)
+
+if (ON)
+  add_executable(BasicMPR
+    BasicMPR.cpp
+    )
 
-install(
-  TARGETS BasicScene
-  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
-  )
+  target_link_libraries(BasicMPR OrthancStone)
+
+  install(
+    TARGETS BasicMPR
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
+    )
+endif()
+  
 
 install(
   FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/BasicMPR.wasm
   ${CMAKE_CURRENT_BINARY_DIR}/BasicScene.wasm
+  ${CMAKE_SOURCE_DIR}/BasicMPR.html
   ${CMAKE_SOURCE_DIR}/BasicScene.html
   ${CMAKE_SOURCE_DIR}/Configuration.json
+  ${CMAKE_SOURCE_DIR}/app.js
   ${CMAKE_SOURCE_DIR}/index.html
   DESTINATION ${CMAKE_INSTALL_PREFIX}
   )