Mercurial > hg > orthanc-webviewer
changeset 195:e481ff4a86cc
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 17 Apr 2018 14:47:37 +0200 |
parents | a1ca7cf02939 |
children | b83fe581f6ae |
files | CMakeLists.txt Resources/Orthanc/DownloadOrthancFramework.cmake UnitTestsSources/UnitTestsMain.cpp |
diffstat | 3 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 17 13:46:24 2018 +0200 +++ b/CMakeLists.txt Tue Apr 17 14:47:37 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) @@ -119,9 +121,6 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework CoreFoundation") endif() -add_definitions( - -DORTHANC_SANDBOXED=0 - ) set(CORE_SOURCES ${CMAKE_SOURCE_DIR}/Plugin/Cache/CacheManager.cpp
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake Tue Apr 17 13:46:24 2018 +0200 +++ b/Resources/Orthanc/DownloadOrthancFramework.cmake Tue Apr 17 14:47:37 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}")
--- a/UnitTestsSources/UnitTestsMain.cpp Tue Apr 17 13:46:24 2018 +0200 +++ b/UnitTestsSources/UnitTestsMain.cpp Tue Apr 17 14:47:37 2018 +0200 @@ -196,8 +196,8 @@ ::testing::InitGoogleTest(&argc, argv); - Orthanc::Logging::Initialize(); - Orthanc::Logging::EnableInfoLevel(true); + /*Orthanc::Logging::Initialize(); + Orthanc::Logging::EnableInfoLevel(true);*/ return RUN_ALL_TESTS(); }