From bbf184b036c0b740b3fb0a95f5ce53dfa6151b52 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 13 Aug 2018 14:18:44 +0000 Subject: Modify GUDHIConfig.cmake in order to have : Order is : 1. user defined GUDHI_INCLUDE_DIRS 2. ${CMAKE_SOURCE_DIR}/include => Where the 'cmake' has been done 3. ${CMAKE_INSTALL_PREFIX}/include => Where the 'make install' has been performed git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3775 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 506357257ce261cb2778e357ca902401da4838e7 --- src/GUDHIConfig.cmake.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/GUDHIConfig.cmake.in') diff --git a/src/GUDHIConfig.cmake.in b/src/GUDHIConfig.cmake.in index 02b540dc..8d82f235 100644 --- a/src/GUDHIConfig.cmake.in +++ b/src/GUDHIConfig.cmake.in @@ -1,7 +1,12 @@ # - Config file for the GUDHI package # It defines the following variables # GUDHI_INCLUDE_DIRS - include directories for GUDHI +# +# Order is : +# 1. user defined GUDHI_INCLUDE_DIRS +# 2. ${CMAKE_SOURCE_DIR}/include => Where the 'cmake' has been done +# 3. ${CMAKE_INSTALL_PREFIX}/include => Where the 'make install' has been performed # Compute paths -set(GUDHI_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") +set(GUDHI_INCLUDE_DIRS "${GUDHI_INCLUDE_DIRS};@CONF_INCLUDE_DIRS@") -- cgit v1.2.3