C++: Compile fixes on OSX
authorJarvis <jarvis@Jarviss-iMac.local>
Sat, 12 Oct 2019 19:06:08 +0000 (22:06 +0300)
committerJarvis <jarvis@Jarviss-iMac.local>
Sat, 12 Oct 2019 19:06:08 +0000 (22:06 +0300)
Common/C++/SmartAPI/smartapi.pro
Common/C++/SmartAPI/smartapi/model/Obj.cpp
Common/C++/SmartAPI/smartapi/rdf/Variant.cpp

index 8c93955fa23d01912635b69507728445bb637bc9..55558499c9fbfe593703741d04adf63b5f394c48 100644 (file)
@@ -35,10 +35,9 @@ INCLUDEPATH += "/usr/include/raptor2/"
 INCLUDEPATH += "/usr/include/rasqal/"
 
 macx {
-       INCLUDEPATH += "/usr/local/include/"
-       INCLUDEPATH += "/usr/local/include/redland/"
-       INCLUDEPATH += "/usr/local/include/raptor2/"
-       INCLUDEPATH += "/usr/local/include/rasqal/"
+       INCLUDEPATH += "/Users/jarvis/workspace/Jarvis_Lib/Jarvis_1.0/redland/include"
+       INCLUDEPATH += "/Users/jarvis/workspace/Jarvis_Lib/Jarvis_1.0/raptor/include"
+       INCLUDEPATH += "/Users/jarvis/workspace/Jarvis_Lib/Jarvis_1.0/rasqal/include"
        LIBS += -L/usr/local/lib
 
        # use openssl installed with brew instead of default
index 95803d710c1c34849a083960b0a6f24b7e24da1d..0a03d55764f008c04f364bc0bce765821da15b1a 100755 (executable)
@@ -32,7 +32,6 @@
 #include "smartapi/model/ServiceProvider.h"
 #include "smartapi/model/TimeSeries.h"
 #include "smartapi/model/Transaction.h"
-#include "smartapi/model/WeatherServiceProvider.h"
        
        
 Obj::Obj(QString identifierUri)
index dce26ff4aedeb4c5523e1acbf02a5e34aeb7ec79..ca840b1fb73c573d91069f2cb2aa5c30acd6ee6b 100644 (file)
@@ -11,7 +11,6 @@
 #include "smartapi/model/Evaluation.h"
 #include "smartapi/model/Device.h"
 #include "smartapi/model/Map.h"
-#include "smartapi/model/WeatherServiceProvider.h"
 #include "smartapi/model/ServiceProvider.h"
 #include "smartapi/model/PhysicalEntity.h"
 #include "smartapi/model/AbstractEntity.h"