From: Romain Forlot Date: Wed, 28 Jun 2017 14:38:10 +0000 (+0200) Subject: Move variable definition to the right place. X-Git-Tag: dab_3.99.3~43 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=3a798fa04ebfd9f7644f304af41baedd1e2a591f;p=staging%2Fxdg-launcher.git Move variable definition to the right place. Change-Id: I36c0ff6d5b65b5da1258bb9807a5476cba2e4280 Signed-off-by: Romain Forlot --- diff --git a/cmake/cmake.d/01-variables.cmake b/cmake/cmake.d/01-variables.cmake index 8d4f0d1..123c0f6 100644 --- a/cmake/cmake.d/01-variables.cmake +++ b/cmake/cmake.d/01-variables.cmake @@ -45,6 +45,9 @@ if(NOT WIN32) set(BoldWhite "${Esc}[1;37m") endif() +# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable] +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path") + # Native packaging name set(NPKG_PROJECT_NAME agl-${PROJECT_NAME}) diff --git a/cmake/cmake.d/04-build_options.cmake b/cmake/cmake.d/04-build_options.cmake index b216262..45b4720 100644 --- a/cmake/cmake.d/04-build_options.cmake +++ b/cmake/cmake.d/04-build_options.cmake @@ -89,9 +89,6 @@ else() endif() set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE STRING "Installation Prefix") -# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable] -set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path") - # Loop on required package and add options foreach (PKG_CONFIG ${PKG_REQUIRED_LIST}) string(REGEX REPLACE "[<>]?=.*$" "" XPREFIX ${PKG_CONFIG})