Mercurial > hg > orthanc-stone
changeset 573:adc1be326b62
cont
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2019 17:29:44 +0200 |
| parents | b853174411d2 |
| children | 911297a277c4 |
| files | Applications/Samples/CMakeLists.txt Applications/Samples/SampleMainNative.cpp Resources/CMake/OrthancStoneConfiguration.cmake Resources/CMake/OrthancStoneParameters.cmake |
| diffstat | 4 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/Samples/CMakeLists.txt Thu Apr 18 16:44:27 2019 +0200 +++ b/Applications/Samples/CMakeLists.txt Thu Apr 18 17:29:44 2019 +0200 @@ -216,7 +216,6 @@ ${SIMPLE_VIEWER_APPLICATION_SOURCES} ) target_link_libraries(OrthancStoneSimpleViewer OrthancStone) - endif() #####################################################################
--- a/Applications/Samples/SampleMainNative.cpp Thu Apr 18 16:44:27 2019 +0200 +++ b/Applications/Samples/SampleMainNative.cpp Thu Apr 18 17:29:44 2019 +0200 @@ -42,3 +42,4 @@ return qtAppRunner.Execute(argc, argv); #endif } +
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Thu Apr 18 16:44:27 2019 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Thu Apr 18 17:29:44 2019 +0200 @@ -30,10 +30,6 @@ endif() endif() -if (ENABLE_SSL AND ENABLE_CURL) - set(ENABLE_OPENSSL_ENGINES ON) -endif() - include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) include_directories(${ORTHANC_ROOT}) include_directories(${ORTHANC_ROOT}/Core/Images) # hack for the numerous #include "../Enumerations.h" in Orthanc to work
--- a/Resources/CMake/OrthancStoneParameters.cmake Thu Apr 18 16:44:27 2019 +0200 +++ b/Resources/CMake/OrthancStoneParameters.cmake Thu Apr 18 17:29:44 2019 +0200 @@ -27,9 +27,10 @@ set(ENABLE_DCMTK OFF) set(ENABLE_GOOGLE_TEST ON) +set(ENABLE_JPEG ON) +set(ENABLE_OPENSSL_ENGINES ON) +set(ENABLE_PNG ON) set(ENABLE_SQLITE OFF) -set(ENABLE_JPEG ON) -set(ENABLE_PNG ON) set(ENABLE_ZLIB ON) set(HAS_EMBEDDED_RESOURCES ON)