Fix: missing dev pkg files error. Now well checked
authorRomain Forlot <romain.forlot@iot.bzh>
Thu, 17 Aug 2017 12:58:13 +0000 (14:58 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 17 Aug 2017 16:38:06 +0000 (18:38 +0200)
Change-Id: I2c429322990f5a4f0ba192c49502026f4b37dd1d
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
cmake/cmake.d/04-extra_targets.cmake

index 2143741..d54e128 100644 (file)
@@ -84,12 +84,15 @@ foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
        # Only doable within a native environment not under SDK
        if( OSRELEASE MATCHES "debian" AND NOT DEFINED ENV{SDKTARGETSYSROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
                execute_process(
-                       COMMAND dpkg -S *${XPREFIX}.pc
+                       COMMAND pkg-config --print-provides ${XPREFIX}
                                        OUTPUT_VARIABLE TMP_PKG_BIN
                )
-               #Need to be harden check
-               string(REGEX REPLACE ":.*$" "" PKG_BIN ${TMP_PKG_BIN})
-               set(DEB_PKG_DEPS "${DEB_PKG_DEPS} ${PKG_BIN} ${DEB_EXTRA_DEP}")
+               if(TMP_PKG_BIN)
+                       string(REGEX REPLACE " *=.*$" "" PKG_BIN ${TMP_PKG_BIN})
+                       set(DEB_PKG_DEPS "${DEB_PKG_DEPS} ${PKG_BIN} ${DEB_EXTRA_DEP}")
+               else()
+                       message(FATAL_ERROR "-- ${Red}${XPREFIX} development files not installed. Abort.${ColourReset}")
+               endif()
        endif()
 endforeach()