diff StoneWebViewer/WebAssembly/CMakeLists.txt @ 1512:244ad1e4e76a

reorganization of folders
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 Jul 2020 16:21:02 +0200
parents d8af188ab545
children 2b7d34cb764f
line wrap: on
line diff
--- a/StoneWebViewer/WebAssembly/CMakeLists.txt	Tue Jul 07 10:02:59 2020 +0200
+++ b/StoneWebViewer/WebAssembly/CMakeLists.txt	Tue Jul 07 16:21:02 2020 +0200
@@ -5,8 +5,6 @@
 # Configuration of the Emscripten compiler for WebAssembly target
 # ---------------------------------------------------------------
 set(USE_WASM ON CACHE BOOL "")
-set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../orthanc/OrthancFramework CACHE PATH "")
-set(STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../)
 
 set(EMSCRIPTEN_SET_LLVM_WASM_BACKEND ON CACHE BOOL "")
 
@@ -30,11 +28,8 @@
 # Stone of Orthanc configuration
 # ---------------------------------------------------------------
 set(ALLOW_DOWNLOADS ON)
-set(ORTHANC_FRAMEWORK_SOURCE "path")
 
-include(${STONE_ROOT}/Resources/CMake/OrthancStoneParameters.cmake)
-include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
-include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/DownloadPackage.cmake)
+include(${CMAKE_SOURCE_DIR}/../../OrthancStone/Resources/CMake/OrthancStoneParameters.cmake)
 
 SET(ENABLE_DCMTK ON)
 SET(ENABLE_DCMTK_NETWORKING OFF)
@@ -46,7 +41,7 @@
 
 # this will set up the build system for Stone of Orthanc and will
 # populate the ORTHANC_STONE_SOURCES CMake variable
-include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
+include(${ORTHANC_STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake)
 
 
 ################################################################################