domoticz-openzwave.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 42082192..f16726f8 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -298,9 +298,9 @@
   6  ADD_CUSTOM_TARGET(revisiontag ALL)
   7
   8  # creates appversion.h using cmake script
   9 -ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND}
  10 -   -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
  11 -   -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake)
  12 +#ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND}
  13 +#   -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
  14 +#   -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake)
  15
  16  ## Target
  17  set(
  18 @@ -700,7 +700,7 @@
  19  IF(OpenZWave)
  20    message(STATUS ${OpenZWave})
  21    target_link_libraries(domoticz ${OpenZWave})
  22 -  include_directories(${CMAKE_SOURCE_DIR}/hardware/openzwave)
  23 +  include_directories(${OPENZWAVE_INCLUDE_DIRS})
  24    add_definitions(-DWITH_OPENZWAVE)
  25  ELSE()
  26    MESSAGE(STATUS "==== OpenZWave not found, support disabled!")
  27 diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp
  28 index ffd8d742..79c708ce 100644
  29 --- a/hardware/openzwave/control_panel/ozwcp.cpp
  30 +++ b/hardware/openzwave/control_panel/ozwcp.cpp
  31 @@ -39,11 +39,11 @@
  32  #include <stdlib.h>
  33  #include <time.h>
  34  #include <string.h>
  35 -#include "../Options.h"
  36 -#include "../Manager.h"
  37 -#include "../Node.h"
  38 -#include "../Group.h"
  39 -#include "../Notification.h"
  40 +#include <Options.h>
  41 +#include <Manager.h>
  42 +#include <Node.h>
  43 +#include <Group.h>
  44 +#include <Notification.h>
  45  #include "..//main/Logger.h"
  46
  47  #include <sys/stat.h>
  48 diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h
  49 index 29ebc0e3..7a027815 100644
  50 --- a/hardware/openzwave/control_panel/ozwcp.h
  51 +++ b/hardware/openzwave/control_panel/ozwcp.h
  52 @@ -37,8 +37,8 @@
  53
  54  #include <list>
  55  #include <algorithm>
  56 -#include "Driver.h"
  57 -#include "Notification.h"
  58 +#include <Driver.h>
  59 +#include <Notification.h>
  60
  61  #define MAX_NODES 255
  62