From 68206da48e75b1122e38e2f1bf6ac6d2bc9317be Mon Sep 17 00:00:00 2001
From: NADAL Jean-Baptiste <jbnadal@awox.com>
Date: Mon, 6 Jan 2020 16:59:15 +0100
Subject: [PATCH] Update cmake and drone.yml

---
 .drone.yml           |  2 +-
 lib/CMakeLists.txt   |  6 +++---
 patches/nats.c.patch | 13 +++++++++++++
 patches/qlibc.patch  | 15 +++++++++++++++
 src/CMakeLists.txt   | 10 +++++-----
 5 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 patches/nats.c.patch
 create mode 100644 patches/qlibc.patch

diff --git a/.drone.yml b/.drone.yml
index 39db0d1..710e66d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,7 +20,7 @@ steps:
   commands:
   - mkdir -p domo-iot/build 
   - cd domo-iot/build && cmake ..
-  - cd domo-iot/build && make
+  - pwd && cd domo-iot/build && make
 
 image_pull_secrets:
 - dockerconfigjson
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9fe59ec..46c43cb 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -4,9 +4,9 @@ project (librestd)
 
 add_definitions (-DBUILD_DEBUG)
 
-include_directories (${CMAKE_SOURCE_DIR}/libevent/include)
-include_directories (${CMAKE_SOURCE_DIR}/build/libevent/include)
-include_directories (${CMAKE_SOURCE_DIR}/qlibc/include)
+include_directories (${CMAKE_SOURCE_DIR}/../libevent/include)
+include_directories (${CMAKE_BINARY_DIR}/libevent/include)
+include_directories (${CMAKE_SOURCE_DIR}/../qlibc/include)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library(restd-static STATIC 
diff --git a/patches/nats.c.patch b/patches/nats.c.patch
new file mode 100644
index 0000000..2472772
--- /dev/null
+++ b/patches/nats.c.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ca6ea1..b25bf76 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ option(NATS_BUILD_EXAMPLES "Build examples" ON)
+ option(NATS_BUILD_LIBUV_EXAMPLE "Build libuv examples" OFF)
+ option(NATS_BUILD_LIBEVENT_EXAMPLE "Build libevent examples" OFF)
+ option(NATS_BUILD_STATIC_EXAMPLES "Statically link examples" OFF)
+-option(NATS_BUILD_STREAMING "Build NATS Streaming" ON)
++option(NATS_BUILD_STREAMING "Build NATS Streaming" OFF)
+ option(NATS_BUILD_NO_PREFIX_CONNSTS "No prefix for connection status enum" OFF)
+ option(NATS_BUILD_LIB_STATIC "Build static library" ON)
+ option(NATS_BUILD_LIB_SHARED "Build shared library" ON)
diff --git a/patches/qlibc.patch b/patches/qlibc.patch
new file mode 100644
index 0000000..bddee1e
--- /dev/null
+++ b/patches/qlibc.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 827343c..885b20d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,7 +75,9 @@ FILE(GLOB_RECURSE SRC_LIB
+ FILE(GLOB_RECURSE SRC_LIB_EXT
+ 		${SRC_SEARCH_PATHS_EXT})
+ 
+-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${qlibc_SOURCE_DIR}/lib)
++if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
++    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${qlibc_SOURCE_DIR}/lib)
++endif()
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${qlibc_SOURCE_DIR}/lib)
+ 
+ ADD_LIBRARY(qlibc-static STATIC ${SRC_LIB})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3bd5d49..262f31c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,13 +7,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS On)
 
 link_directories(${CMAKE_SOURCE_DIR}/build/lib)
 
-include_directories (${CMAKE_SOURCE_DIR}/domo-iot/lib/include)
-include_directories (${CMAKE_SOURCE_DIR}/libevent/include)
+include_directories (${CMAKE_SOURCE_DIR}/lib/include)
+include_directories (${CMAKE_SOURCE_DIR}/../libevent/include)
 include_directories (${CMAKE_BINARY_DIR}/libevent/include)
-include_directories (${CMAKE_SOURCE_DIR}/qlibc/include)
-include_directories (${CMAKE_SOURCE_DIR}/json-c)
+include_directories (${CMAKE_SOURCE_DIR}/../qlibc/include)
+include_directories (${CMAKE_SOURCE_DIR}/../json-c)
 include_directories (${CMAKE_BINARY_DIR}/json-c)
-include_directories (${CMAKE_SOURCE_DIR}/nats.c/src)
+include_directories (${CMAKE_SOURCE_DIR}/../nats.c/src)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
 #set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")