changeset 31:acfe1ea3206b

fix paths
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Jun 2020 07:55:18 +0200
parents f1ebec09b120
children 17a436599653
files CMakeLists.txt Plugin/GoogleAccount.cpp Plugin/GoogleAccount.h Plugin/Plugin.cpp
diffstat 4 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Jun 30 07:44:54 2020 +0200
+++ b/CMakeLists.txt	Tue Jun 30 07:55:18 2020 +0200
@@ -78,7 +78,8 @@
 
 include_directories(
   ${AUTOGENERATED_DIR}
-  ${ORTHANC_ROOT}
+  ${ORTHANC_ROOT}/Core/
+  ${ORTHANC_ROOT}/Plugins/Samples/Common/
   )
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
--- a/Plugin/GoogleAccount.cpp	Tue Jun 30 07:44:54 2020 +0200
+++ b/Plugin/GoogleAccount.cpp	Tue Jun 30 07:55:18 2020 +0200
@@ -31,7 +31,7 @@
 
 #include "GoogleAccount.h"
 
-#include <Core/Toolbox.h>
+#include <Toolbox.h>
 
 void GoogleAccount::LoadAuthorizedUser(const std::string& json)
 {
--- a/Plugin/GoogleAccount.h	Tue Jun 30 07:44:54 2020 +0200
+++ b/Plugin/GoogleAccount.h	Tue Jun 30 07:55:18 2020 +0200
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include <Plugins/Samples/Common/OrthancPluginCppWrapper.h>
+#include <OrthancPluginCppWrapper.h>
 
 #include <google/cloud/storage/oauth2/authorized_user_credentials.h>
 #include <google/cloud/storage/oauth2/service_account_credentials.h>
--- a/Plugin/Plugin.cpp	Tue Jun 30 07:44:54 2020 +0200
+++ b/Plugin/Plugin.cpp	Tue Jun 30 07:55:18 2020 +0200
@@ -32,9 +32,9 @@
 #include "GoogleConfiguration.h"
 #include "GoogleUpdater.h"
 
-#include <Core/HttpClient.h>
-#include <Core/Toolbox.h>
-#include <Plugins/Samples/Common/OrthancPluginCppWrapper.h>
+#include <HttpClient.h>
+#include <Toolbox.h>
+#include <OrthancPluginCppWrapper.h>
 
 
 static bool CheckDicomWebVersion()