Mercurial > hg > orthanc-dicomweb
changeset 422:641b21848ed5
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 25 May 2020 14:06:06 +0200 |
| parents | 5872e4881ead |
| children | d575f05723eb 906efffc68fd |
| files | Resources/Orthanc/DownloadOrthancFramework.cmake Resources/Orthanc/LinuxStandardBaseToolchain.cmake Resources/SyncOrthancFolder.py |
| diffstat | 3 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake Mon May 25 13:16:30 2020 +0200 +++ b/Resources/Orthanc/DownloadOrthancFramework.cmake Mon May 25 14:06:06 2020 +0200 @@ -114,6 +114,10 @@ set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.0") set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.1") + set(ORTHANC_FRAMEWORK_MD5 "3971f5de96ba71dc9d3f3690afeaa7c0") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.0") + set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -216,7 +220,7 @@ else() message("Forking the Orthanc source repository using Mercurial") execute_process( - COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://bitbucket.org/sjodogne/orthanc" + COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://hg.orthanc-server.com/orthanc/" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure )
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Mon May 25 13:16:30 2020 +0200 +++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Mon May 25 14:06:06 2020 +0200 @@ -1,11 +1,19 @@ -# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -G Ninja +# +# Full build, as used on the BuildBot CIS: +# +# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja +# +# Or, more lightweight version (without libp11 and ICU): +# +# $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja +# INCLUDE(CMakeForceCompiler) -SET(LSB_PATH $ENV{LSB_PATH}) -SET(LSB_CC $ENV{LSB_CC}) -SET(LSB_CXX $ENV{LSB_CXX}) -SET(LSB_TARGET_VERSION "4.0") +SET(LSB_PATH $ENV{LSB_PATH} CACHE STRING "") +SET(LSB_CC $ENV{LSB_CC} CACHE STRING "") +SET(LSB_CXX $ENV{LSB_CXX} CACHE STRING "") +SET(LSB_TARGET_VERSION "4.0" CACHE STRING "") IF ("${LSB_PATH}" STREQUAL "") SET(LSB_PATH "/opt/lsb")
--- a/Resources/SyncOrthancFolder.py Mon May 25 13:16:30 2020 +0200 +++ b/Resources/SyncOrthancFolder.py Mon May 25 14:06:06 2020 +0200 @@ -12,7 +12,7 @@ TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc') PLUGIN_SDK_VERSION = '1.5.7' -REPOSITORY = 'https://bitbucket.org/sjodogne/orthanc/raw' +REPOSITORY = 'https://hg.orthanc-server.com/orthanc/raw-file' FILES = [ 'DownloadOrthancFramework.cmake',