Commit 7692c953 authored by Karel Hanák's avatar Karel Hanák
Browse files

Daemon: fixed patch 2


Signed-off-by: Karel Hanák's avatarKarel Hanák <karel.hanak@iqrf.org>
parent 4563c371
From 6eec191ba41ca8d782d75ae962c3d00174acb913 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue, 24 Mar 2020 20:28:20 +0100
Subject: [PATCH] wip
From 2a20d3740fdd761def0146ae9a1b8ff533f00d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Han=C3=A1k?= <karel.hanak@iqrf.org>
Date: Sat, 26 Jun 2021 09:02:31 +0200
Subject: [PATCH] h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Karel Hanák <karel.hanak@iqrf.org>
---
CMakeLists.txt | 11 +++++------
cmake/ShapeComponentDeclaration.cmake | 8 ++++----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12af75f..2a2260b 100644
index 73232602..8e56376e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.0)
@@ -18,11 +18,11 @@ cmake_minimum_required(VERSION 3.0)
project(iqrf-gateway-daemon)
set(PROJECT_CMAKE_MODULE_PATH ${PROJECT_CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
......@@ -27,26 +30,26 @@ index 12af75f..2a2260b 100644
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -90,7 +90,7 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG
@@ -105,7 +105,7 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG
#find_library(SHAPE_LIBRARY NAMES libTraceFormatService.so
# HINTS "/usr/local/Debug/shape/lib")
-find_path(SHAPE_INCLUDE_DIR Args.h)
+find_path(SHAPE_INCLUDE_DIR NAMES "Args.h" PATH_SUFFIXES "shape")
message("!!!!SHAPE LIB: ${SHAPE_LIBRARY} - ${SHAPE_INCLUDE_DIR}")
@@ -99,8 +99,7 @@ include_directories(${SHAPE_INCLUDE_DIR})
@@ -113,8 +113,7 @@ include_directories(${SHAPE_INCLUDE_DIR})
#find_library(SHAPEWARE_LIBRARY NAMES libCommandLineService.so
# HINTS "/usr/local/Debug/shapeware/lib")
-find_path(SHAPEWARE_INCLUDE_DIR IBufferService.h
- HINTS "/usr/local/include/shapeware" )
+find_path(SHAPEWARE_INCLUDE_DIR NAMES "IBufferService.h" PATH_SUFFIXES "shapeware" )
- HINTS "/usr/local/include/shapeware")
+find_path(SHAPEWARE_INCLUDE_DIR NAMES "IBufferService.h" PATH_SUFFIXES "shapeware")
message("!!!!SHAPEWARE LIB: ${SHAPEWARE_LIBRARY} - ${SHAPEWARE_INCLUDE_DIR}")
@@ -109,7 +108,7 @@ include_directories(${SHAPEWARE_INCLUDE_DIR})
@@ -122,7 +121,7 @@ include_directories(${SHAPEWARE_INCLUDE_DIR})
message(STATUS "CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
......@@ -56,7 +59,7 @@ index 12af75f..2a2260b 100644
add_definitions(
-DRAPIDJSON_HAS_STDSTRING
diff --git a/cmake/ShapeComponentDeclaration.cmake b/cmake/ShapeComponentDeclaration.cmake
index fe47549..202b595 100644
index fe47549f..63f65f98 100644
--- a/cmake/ShapeComponentDeclaration.cmake
+++ b/cmake/ShapeComponentDeclaration.cmake
@@ -40,7 +40,7 @@ function(ConfigureShapeComponent componentName componentHeader)
......@@ -90,5 +93,5 @@ index fe47549..202b595 100644
endif()
--
2.7.4
2.25.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment