From b6ec60a26d8c59cfb51b74d6bc1b9fb85b0ac0c4 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Mon, 9 May 2011 16:54:15 +0200 Subject: [PATCH 1/1] Don't include generated headers into distrib. --- buildtools/Cmake/DefinePackages.cmake | 6 ++++-- buildtools/Cmake/Distrib.cmake | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 003520bb77..8375a45ac3 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -396,7 +396,6 @@ set(install_HEADERS include/simdag/simdag.h include/simdag/datatypes.h include/smpi/smpi.h - ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h include/smpi/mpi.h include/smpi/mpif.h include/surf/surfxml_parse.h @@ -413,13 +412,16 @@ set(install_HEADERS include/amok/peermanagement.h include/amok/bandwidth.h include/instr/instr.h - ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h include/gras.h include/xbt.h include/simix/simix.h include/simix/datatypes.h include/simix/context.h ) +set(GENERATE_HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h + ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h +) ### depend of some variables setted upper # -->CONTEXT_THREADS CONTEXT_UCONTEXT diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index d12a638d78..f38b21e8a2 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -78,12 +78,16 @@ if(enable_lib_static AND NOT WIN32) endif(enable_lib_static AND NOT WIN32) # include files -foreach(file ${install_HEADERS}) +set(HEADERS + ${install_HEADERS} + ${GENERATE_HEADERS} + ) +foreach(file ${HEADERS}) get_filename_component(location ${file} PATH) string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}") install(FILES ${file} DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location}) -endforeach(file ${install_HEADERS}) +endforeach(file ${HEADERS}) # example files foreach(file ${examples_to_install_in_doc}) -- 2.20.1