# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1555578343 0
# Node ID 375dc0aeb19b7c0ee84a79b49af59568090cdd00
# Parent  37e396ae08a343b7a0fb2a89ec4c0ed4ca549ba8# Parent  ccd1a1ede305baaf2388960403319425909eefe1
Merged am-dev into default

diff -r 37e396ae08a3 -r 375dc0aeb19b Applications/StoneApplicationContext.h
--- a/Applications/StoneApplicationContext.h	Thu Apr 18 07:30:56 2019 +0000
+++ b/Applications/StoneApplicationContext.h	Thu Apr 18 09:05:43 2019 +0000
@@ -27,7 +27,24 @@
 #include "../Framework/Viewport/WidgetViewport.h"
 
 
+#ifdef _MSC_VER
+  #if _MSC_VER > 1910
+    #define orthanc_override override
   #else
+    #define orthanc_override
+  #endif
+#elif defined __GNUC__
+  #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+/* Test for GCC > 3.2.0 */
+  #if GCC_VERSION > 40900
+    #define orthanc_override override
+  #else
+    #define orthanc_override
+  #endif
+#else
+    #define orthanc_override
+#endif
+
 #include <list>
 
 namespace OrthancStone
diff -r 37e396ae08a3 -r 375dc0aeb19b Resources/CMake/OrthancStoneConfiguration.cmake
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Apr 18 07:30:56 2019 +0000
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Apr 18 09:05:43 2019 +0000
@@ -351,7 +351,7 @@
   ${BOOST_EXTENDED_SOURCES}
   )
 
-
+include_directories(${ORTHANC_STONE_ROOT})
 
 
 ##