# HG changeset patch # User Sebastien Jodogne # Date 1606976520 -3600 # Node ID 2bb735d767267fc5d30f3345e09eac4e565e38a1 # Parent 940575fba3464ecb40945c60884ce773b82a5712 fix CMake for wasm samples diff -r 940575fba346 -r 2bb735d76726 Applications/Samples/WebAssembly/CMakeLists.txt --- a/Applications/Samples/WebAssembly/CMakeLists.txt Wed Dec 02 15:43:58 2020 +0100 +++ b/Applications/Samples/WebAssembly/CMakeLists.txt Thu Dec 03 07:22:00 2020 +0100 @@ -22,6 +22,16 @@ project(OrthancStone) +set(SAMPLES_VERSION "mainline") + +if (SAMPLES_VERSION STREQUAL "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +else() + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "82652c5fc04f") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") +endif() + set(ORTHANC_STONE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../../wasm-binaries/" CACHE PATH "Where to put the WebAssembly binaries") diff -r 940575fba346 -r 2bb735d76726 UnitTestsSources/WebAssembly/CMakeLists.txt --- a/UnitTestsSources/WebAssembly/CMakeLists.txt Wed Dec 02 15:43:58 2020 +0100 +++ b/UnitTestsSources/WebAssembly/CMakeLists.txt Thu Dec 03 07:22:00 2020 +0100 @@ -22,6 +22,8 @@ project(OrthancStone) +set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") +set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") set(ORTHANC_STONE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../wasm-binaries/" CACHE PATH "Where to put the WebAssembly binaries")