From f4f3096182589b7031905511d44b86cc7ff0bfa4 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 28 Aug 2017 18:54:41 +0200
Subject: 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>
---
 cmake/cmake.d/02-variables.cmake | 19 -------------------
 cmake/cmake.d/03-macros.cmake    |  9 ---------
 2 files changed, 28 deletions(-)

(limited to 'cmake/cmake.d')

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)
-- 
cgit 1.2.3-korg