diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-08-28 18:54:41 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-28 18:54:52 +0200 |
| commit | 4488c5e9443336de6e7c391394ee619d15b38bed (patch) | |
| tree | 9544f288f33010e4463ab19526ef786315f5e195 /cmake/cmake.d | |
| parent | 7995a0017b601a524900e231c81026c667d07273 (diff) | |
Dirty fix to handle distro specific packages deps
Could include first distro specific file to be able to modify
variable from config.cmake and then process classic submodule
cmake files.
Change-Id: Id5dad2504d44c86cb165ad56f5314e9c0c545f0b
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake/cmake.d')
| -rw-r--r-- | cmake/cmake.d/02-variables.cmake | 19 | ||||
| -rw-r--r-- | cmake/cmake.d/03-macros.cmake | 9 |
2 files changed, 0 insertions, 28 deletions
diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake index 4a4e503..e69f342 100644 --- a/cmake/cmake.d/02-variables.cmake +++ b/cmake/cmake.d/02-variables.cmake @@ -66,25 +66,6 @@ math(EXPR c "(${LINUX_VERSION_CODE} & 255)") set(KERNEL_VERSION "${a}.${b}.${c}") -# Get the os type -# Used to package .deb -set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release") -if(EXISTS ${OS_RELEASE_PATH}) - execute_process(COMMAND bash "-c" "grep -E '^ID(_LIKE)?=' ${OS_RELEASE_PATH} | tail -n 1" - OUTPUT_VARIABLE TMP_OSRELEASE - ) - - if (NOT TMP_OSRELEASE STREQUAL "") - string(REGEX REPLACE ".*=\"?([0-9a-z\._-]*)\"?\n" "\\1" OSRELEASE ${TMP_OSRELEASE}) - else() - set(OSRELEASE "NOT COMPATIBLE !") - endif() - -else() - set(OSRELEASE "NOT COMPATIBLE ! Missing ${OS_RELEASE_PATH} file.") -endif() -message(STATUS "Distribution used ${OSRELEASE}") - # Include project configuration # ------------------------------ project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES}) diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index a706773..cb830d1 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -121,15 +121,6 @@ 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) if(NOT DEFINED XML_FILES) |