Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var

Following change ID 1ec753146f, CMAKE_INSTALL_PREFIX has been
replaced by INSTALL_PREFIX. So differ CMAKE_PREFIX_PATH and
LD_LIBRARY_PATH setting in 03-macros in order to be sure that
CMAKE_INSTALL_PREFIX has been set correctly.

Change-Id: I6effcaaab658fd24c929cd4a30fa38ad8f4df145
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 0d24a40..5595e63 100644 (file)
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -113,6 +113,10 @@ macro(set_install_prefix)
                message(STATUS "-- Overwrite the CMAKE default install prefix with ${INSTALL_PREFIX}")
                set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE PATH "Install prefix" FORCE)
        endif()
+       # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
+       # ---------------------------------------------------------------------
+       set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig CACHE PATH 'Prefix Path list used by pkgconfig module')
+       set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH 'Path list where to search for libraries')
 endmacro()
 
 macro(PROJECT_TARGET_ADD TARGET_NAME)

diff --git a/samples.d/config.cmake.sample b/samples.d/config.cmake.sample
index 70715fc..b665fab 100644 (file)
--- a/samples.d/config.cmake.sample
+++ b/samples.d/config.cmake.sample
@@ -125,11 +125,6 @@ set (PKG_REQUIRED_LIST
 # -D_FORTIFY_SOURCE=2
 # CACHE STRING "Compilation flags for RELEASE build type.")
 
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig CACHE PATH 'Prefix Path list used by pkgconfig module')
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH 'Path list where to search for libraries')
-
 # Optional location for config.xml.in
 # -----------------------------------
 #set(WIDGET_ICON "\"conf.d/wgt/${PROJECT_ICON}\"" CACHE PATH "Path to the widget icon")