Mercurial > hg > orthanc-postgresql
changeset 175:4ecd23ad4169
sync
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 17 Apr 2018 14:39:12 +0200 |
| parents | db6cc80efed0 (diff) c5ef9c029a4c (current diff) |
| children | 0831444fd484 |
| files | CMakeLists.txt Resources/Orthanc/DownloadOrthancFramework.cmake |
| diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 17 11:46:16 2018 +0200 +++ b/CMakeLists.txt Tue Apr 17 14:39:12 2018 +0200 @@ -47,6 +47,8 @@ # Download and setup the Orthanc framework include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/DownloadOrthancFramework.cmake) + +set(ORTHANC_FRAMEWORK_PLUGIN ON) include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost)
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake Tue Apr 17 11:46:16 2018 +0200 +++ b/Resources/Orthanc/DownloadOrthancFramework.cmake Tue Apr 17 14:39:12 2018 +0200 @@ -157,18 +157,24 @@ set(ORTHANC_ROOT ${CMAKE_BINARY_DIR}/orthanc) - if (NOT EXISTS ${ORTHANC_ROOT}) + if (EXISTS ${ORTHANC_ROOT}) + message("Updating the Orthanc source repository using Mercurial") + execute_process( + COMMAND ${ORTHANC_FRAMEWORK_HG} pull + WORKING_DIRECTORY ${ORTHANC_ROOT} + RESULT_VARIABLE Failure + ) + else() message("Forking the Orthanc source repository using Mercurial") - execute_process( COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://bitbucket.org/sjodogne/orthanc" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure - ) - - if (Failure OR NOT EXISTS ${ORTHANC_ROOT}) - message(FATAL_ERROR "Cannot fork the Orthanc repository") - endif() + ) + endif() + + if (Failure OR NOT EXISTS ${ORTHANC_ROOT}) + message(FATAL_ERROR "Cannot fork the Orthanc repository") endif() message("Setting branch of the Orthanc repository to: ${ORTHANC_FRAMEWORK_BRANCH}")