summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-21 22:33:03 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-21 22:33:03 +0200
commitde031182cb49d2d0a84a09cc12c50cc6d05a37dd (patch)
tree000d7a87637017ff26b7008058b4a0312a28a58b
parent4d67d060455919313491e904d32eb53b303dc21c (diff)
Add macros to make a 2nd pass on required module
Useful when adding module dependant of distro as they do not named their packages the same way... Change-Id: I0422ce4cdad48f9e815d24510376ad11941d5e3d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--cmake/cmake.d/03-macros.cmake9
-rw-r--r--cmake/common.cmake1
2 files changed, 9 insertions, 1 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 6e223b2..88d6dd4 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -121,6 +121,15 @@ macro(configure_files_in_dir dir)
endforeach()
endmacro(configure_files_in_dir)
+macro(add_required_module PKG_CONFIG)
+ string(REGEX REPLACE "[<>]?=.*$" "" XPREFIX ${PKG_CONFIG})
+ PKG_CHECK_MODULES(${XPREFIX} REQUIRED ${PKG_CONFIG})
+
+ INCLUDE_DIRECTORIES(${${XPREFIX}_INCLUDE_DIRS})
+ list(APPEND link_libraries ${${XPREFIX}_LDFLAGS})
+ add_compile_options (${${XPREFIX}_CFLAGS})
+endmacro(add_required_module)
+
# Create custom target dedicated for HTML5 and DATA AGL target type
macro(add_input_files INPUT_FILES)
set(XML_LIST ${INPUT_FILES})
diff --git a/cmake/common.cmake b/cmake/common.cmake
index 06d04c6..1a7a2f0 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -36,7 +36,6 @@ foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
include(${file})
endforeach()
-message(STATUS "${ENTRY_POINT}/cmake/[0-9][0-9]-${OSRELEASE}*.cmake")
file(GLOB project_cmakefiles ${ENTRY_POINT}/cmake/[0-9][0-9]-common*.cmake ${ENTRY_POINT}/cmake/[0-9][0-9]-${OSRELEASE}*.cmake )
list(SORT project_cmakefiles)
foreach(file ${project_cmakefiles})