# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1555601384 -7200
# Node ID adc1be326b6247e2ff0992e172b0810cbf1d227b
# Parent  b853174411d2d66805aa9c4bf503a94068c6a3d0
cont

diff -r b853174411d2 -r adc1be326b62 Applications/Samples/CMakeLists.txt
--- 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()
 
 #####################################################################
diff -r b853174411d2 -r adc1be326b62 Applications/Samples/SampleMainNative.cpp
--- 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
 }
+
diff -r b853174411d2 -r adc1be326b62 Resources/CMake/OrthancStoneConfiguration.cmake
--- 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
diff -r b853174411d2 -r adc1be326b62 Resources/CMake/OrthancStoneParameters.cmake
--- 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)