X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F04-extra_targets.cmake;h=1894546c532b34ee932de1aec41affdcce52f543;hb=7995a0017b601a524900e231c81026c667d07273;hp=d54e1282cbc0204aeebe0f8f502a8aa3eb46b7af;hpb=f6de0caaf46e14530a04b0792dfdcf6cc49fb78f;p=apps%2Fapp-templates.git diff --git a/cmake/cmake.d/04-extra_targets.cmake b/cmake/cmake.d/04-extra_targets.cmake index d54e128..1894546 100644 --- a/cmake/cmake.d/04-extra_targets.cmake +++ b/cmake/cmake.d/04-extra_targets.cmake @@ -24,15 +24,6 @@ # Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- -# Add a dummy target to enable global dependency order -# ----------------------------------------------------- -if(EXTRA_DEPENDENCIES_ORDER) - set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies) - add_custom_target(${DEPENDENCIES_TARGET} ALL - DEPENDS ${EXTRA_DEPENDENCY_ORDER} - ) -endif() - # ---------------------------------------------------------------------------- # Archive target # ---------------------------------------------------------------------------- @@ -84,11 +75,11 @@ 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 pkg-config --print-provides ${XPREFIX} + COMMAND dpkg -S *${XPREFIX}.pc OUTPUT_VARIABLE TMP_PKG_BIN ) if(TMP_PKG_BIN) - string(REGEX REPLACE " *=.*$" "" PKG_BIN ${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}")