|
 |
415d1f4 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
415d1f4 |
index 42082192..f16726f8 100644
|
|
|
415d1f4 |
--- a/CMakeLists.txt
|
|
|
415d1f4 |
+++ b/CMakeLists.txt
|
|
|
af0f3ae |
@@ -298,9 +298,9 @@
|
|
|
af0f3ae |
ADD_CUSTOM_TARGET(revisiontag ALL)
|
|
|
af0f3ae |
|
|
|
af0f3ae |
# creates appversion.h using cmake script
|
|
|
af0f3ae |
-ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND}
|
|
|
af0f3ae |
- -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
af0f3ae |
- -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake)
|
|
|
af0f3ae |
+#ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND}
|
|
|
af0f3ae |
+# -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
af0f3ae |
+# -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake)
|
|
|
af0f3ae |
|
|
|
af0f3ae |
## Target
|
|
|
af0f3ae |
set(
|
|
|
af0f3ae |
@@ -700,7 +700,7 @@
|
|
|
415d1f4 |
IF(OpenZWave)
|
|
|
415d1f4 |
message(STATUS ${OpenZWave})
|
|
|
415d1f4 |
target_link_libraries(domoticz ${OpenZWave})
|
|
|
415d1f4 |
- include_directories(${CMAKE_SOURCE_DIR}/hardware/openzwave)
|
|
|
415d1f4 |
+ include_directories(${OPENZWAVE_INCLUDE_DIRS})
|
|
|
415d1f4 |
add_definitions(-DWITH_OPENZWAVE)
|
|
|
af0f3ae |
ELSE()
|
|
|
af0f3ae |
MESSAGE(STATUS "==== OpenZWave not found, support disabled!")
|
|
|
415d1f4 |
diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp
|
|
|
415d1f4 |
index ffd8d742..79c708ce 100644
|
|
|
415d1f4 |
--- a/hardware/openzwave/control_panel/ozwcp.cpp
|
|
|
415d1f4 |
+++ b/hardware/openzwave/control_panel/ozwcp.cpp
|
|
|
415d1f4 |
@@ -39,11 +39,11 @@
|
|
|
415d1f4 |
#include <stdlib.h>
|
|
|
415d1f4 |
#include <time.h>
|
|
|
415d1f4 |
#include <string.h>
|
|
|
24bdab9 |
-#include "../Options.h"
|
|
|
24bdab9 |
-#include "../Manager.h"
|
|
|
24bdab9 |
-#include "../Node.h"
|
|
|
24bdab9 |
-#include "../Group.h"
|
|
|
24bdab9 |
-#include "../Notification.h"
|
|
|
415d1f4 |
+#include <Options.h>
|
|
|
415d1f4 |
+#include <Manager.h>
|
|
|
415d1f4 |
+#include <Node.h>
|
|
|
415d1f4 |
+#include <Group.h>
|
|
|
415d1f4 |
+#include <Notification.h>
|
|
|
af0f3ae |
#include "..//main/Logger.h"
|
|
|
415d1f4 |
|
|
|
70a7e43 |
#include <sys/stat.h>
|
|
|
415d1f4 |
diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h
|
|
|
415d1f4 |
index 29ebc0e3..7a027815 100644
|
|
|
415d1f4 |
--- a/hardware/openzwave/control_panel/ozwcp.h
|
|
|
415d1f4 |
+++ b/hardware/openzwave/control_panel/ozwcp.h
|
|
|
415d1f4 |
@@ -37,8 +37,8 @@
|
|
|
415d1f4 |
|
|
|
415d1f4 |
#include <list>
|
|
|
415d1f4 |
#include <algorithm>
|
|
|
415d1f4 |
-#include "Driver.h"
|
|
|
415d1f4 |
-#include "Notification.h"
|
|
|
415d1f4 |
+#include <Driver.h>
|
|
|
415d1f4 |
+#include <Notification.h>
|
|
|
415d1f4 |
|
|
|
af0f3ae |
#define MAX_NODES 255
|
|
|
415d1f4 |
|