diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-02-20 09:16:38 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-02-20 08:26:18 +0000 |
| commit | 88d6c888363194c24fa11716bc2bbbf230af954d (patch) | |
| tree | cf4e66dec3ae7d3075a151107a3cd7f8bb821670 /tradeshow/iot-sensortag | |
| parent | 8479cd598ace19337ff497ef7b3a1020aff0ab5b (diff) | |
Remove hardcoded paths
User has to specify location for cpprest and wastorage when invoking
qmake
Change-Id: Ib0b3b7b0e648022c73ca1f942ebbc423b6f3caf6
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag')
| -rw-r--r-- | tradeshow/iot-sensortag/SensorTagDemo.pro | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/tradeshow/iot-sensortag/SensorTagDemo.pro b/tradeshow/iot-sensortag/SensorTagDemo.pro index 6301c56..49d2acf 100644 --- a/tradeshow/iot-sensortag/SensorTagDemo.pro +++ b/tradeshow/iot-sensortag/SensorTagDemo.pro @@ -28,15 +28,16 @@ win32|linux:!android:!qnx { } win32 { - # Obtained via NuGet - isEmpty(WASTORAGE_LOCATION): WASTORAGE_LOCATION = "C:/Users/mauri/Documents/Visual Studio 2015/Projects/App1/packages/wastorage.v140.2.6.0" - INCLUDEPATH += $$WASTORAGE_LOCATION/build/native/include \ - $$WASTORAGE_LOCATION/build/native/include/was \ - $$WASTORAGE_LOCATION/build/native/include/wascore - LIBS += -L$$WASTORAGE_LOCATION/lib/native/v140/Win32/Release - - isEmpty(CPPRESTSDK_LOCATION): CPPRESTSDK_LOCATION = "C:/Users/mauri/Documents/Visual Studio 2015/Projects/App1/packages/cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1" - INCLUDEPATH += $$CPPRESTSDK_LOCATION/build/native/include + WASTORAGE_PATH = $$(WASTORAGE_LOCATION) + isEmpty(WASTORAGE_PATH): message("Location for Azure Storage libs unknown. Please specify WASTORAGE_LOCATION") + CPPRESTSDK_PATH = $$(CPPRESTSDK_LOCATION) + isEmpty(CPPRESTSDK_PATH): message("Location for CppRest library unknown. Please specify CPPREST_LOCATION") + + INCLUDEPATH += $$WASTORAGE_PATH/build/native/include \ + $$WASTORAGE_PATH/build/native/include/was \ + $$WASTORAGE_PATH/build/native/include/wascore \ + $$CPPRESTSDK_PATH/build/native/include + LIBS += -L$$WASTORAGE_PATH/lib/native/v140/Win32/Release } SOURCES += main.cpp \ @@ -60,7 +61,11 @@ HEADERS += \ seriesstorage.h BLUETOOTH_LINUX_HOST { - !winrt:CONFIG += UPDATE_TO_AZURE + win32 { + !isEmpty(WASTORAGE_PATH):!isEmpty(CPPRESTSDK_LOCATION): CONFIG += UPDATE_TO_AZURE + } else { + CONFIG += UPDATE_TO_AZURE + } DEFINES += RUNS_AS_HOST SOURCES += \ |