domo/domo-iot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update cmake and drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2020-01-06 16:59:15 +01:00
parent dcaa619144
commit 68206da48e
5 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/nats.c.patch Normal file
View File

@@ -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)

15
patches/qlibc.patch Normal file
View File

@@ -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})