From 26bedd979bb768745e0bd26657114ba52b6685be Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 2 Nov 2010 11:31:36 +0000 Subject: [PATCH] Fix install problem with simgrid_config.h. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8494 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/DefinePackages.cmake | 2 +- buildtools/Cmake/Distrib.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index be59f80970..2e0dcac5ad 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -414,7 +414,7 @@ include/gras/timer.h include/amok/peermanagement.h include/amok/bandwidth.h include/instr/instr.h -include/simgrid_config.h +${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h include/gras.h include/xbt.h ) diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 9bb1571bbd..2ca547ba2e 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -50,6 +50,7 @@ endif(enable_smpi) # include files foreach(file ${install_HEADERS}) get_filename_component(location ${file} PATH) + string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}") install(FILES ${file} DESTINATION $ENV{DESTDIR}${prefix}/${location}) endforeach(file ${install_HEADERS}) -- 2.20.1