Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable

Thoemi09 · Mar 5, 2024 · 5410b7e · 5410b7e
2 parents d84525f + a3a49e5
commit 5410b7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/c++/h5/CMakeLists.txt b/c++/h5/CMakeLists.txt
@@ -12,7 +12,7 @@ set_target_properties(${PROJECT_NAME}_c PROPERTIES
   VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
 )
 target_include_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
-target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>)
+target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
 target_compile_definitions(${PROJECT_NAME}_c PUBLIC
 				H5_GIT_HASH=${PROJECT_GIT_HASH}
 				$<$<CONFIG:Debug>:H5_DEBUG>

diff --git a/share/h5vars.sh.in b/share/h5vars.sh.in
@@ -2,8 +2,8 @@
 
 export @PROJECT_NAME@_ROOT=@CMAKE_INSTALL_PREFIX@
 
-export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_FULL_INCLUDEDIR@:$CPLUS_INCLUDE_PATH
-export PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH
+export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
+export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
 export LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LIBRARY_PATH
 export LD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
 export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH