From 21994eaaf671ce91ecce78b451fbb84950140310 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Thu, 14 Jun 2018 12:03:54 +0200 Subject: Remove nasty hack to handle HALs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can now use the High Level API without having to connect directly to HALs. Change-Id: I629f769bfb9cd8a2d9661f9966cd49f0c135a1a3 Signed-off-by: Loïc Collignon --- conf.d/cmake/config.cmake | 36 ------------------------------------ conf.d/wgt/config.xml.in | 2 -- 2 files changed, 38 deletions(-) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index e6acabc..cbe3878 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -32,42 +32,6 @@ set(PROJECT_LANGUAGES "C") # relative to the root project directory set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") -option(ENABLE_HAL_ENSONIQ "Enable the Ensoniqs HAL" OFF) -option(ENABLE_HAL_JABRA "Enable the Jabra's HAL" OFF) -option(ENABLE_HAL_INTEL_MINNOW "Enable the Intel Minnow's HAL" OFF) -option(ENABLE_HAL_INTEL_PC "Enable the Intel PC's HAL" OFF) -option(ENABLE_HAL_RCAR_M3 "Enable the RCar-M3's HAL" OFF) -option(ENABLE_HAL_USB_DEVICE "Enable the USB Device's HAL" OFF) - -set (ENABLED_HALS "") - -if (ENABLE_HAL_ENSONIQ) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -if (ENABLE_HAL_JABRA) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -if (ENABLE_HAL_INTEL_MINNOW) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -if (ENABLE_HAL_INTEL_PC) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -if (ENABLE_HAL_RCAR_M3) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -if (ENABLE_HAL_USB_DEVICE) - set(ENABLED_HALS "${ENABLED_HALS} \n") -endif() - -message(STATUS "ENABLED_HALS:\n${ENABLED_HALS}") - - # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain # but used and must be built and linked. # set(PROJECT_LIBDIR "libs") diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index 65b8b79..1965bc5 100644 --- a/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in @@ -13,8 +13,6 @@ - -@ENABLED_HALS@ -- cgit