From 17f966eb23cc283701f1334ba7a6f023753ac182 Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 19 Apr 2010 14:46:39 +0000 Subject: [PATCH 1/1] Correct command for examples in the install command. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7612 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeDistrib.txt | 32 ++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index c252323564..ab7e562265 100755 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -65,26 +65,28 @@ COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid_colorizer.pl -COMMAND echo "install bin ok" +COMMAND echo "install bin OK" COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib -COMMAND echo "install lib ok" +COMMAND echo "install lib OK" COMMAND cp --parent ${install_HEADERS} $ENV{DESTDIR}${prefix} -COMMAND echo "install include ok" +COMMAND echo "install include OK" COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ $ENV{DESTDIR}${prefix}/doc/simgrid -COMMAND echo "install doc ok" +COMMAND echo "install doc/html OK" WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" ) -string(REPLACE ";" " " ex_to_svg "${ex_to_svg}") -#string(REPLACE "${PROJECT_DIRECTORY}/examples/" "." ex_to_svg "${ex_to_svg}") - +foreach(file ${ex_to_svg}) + string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}") + add_custom_command(TARGET install-simgrid + COMMAND cp --parents -f ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/ + WORKING_DIRECTORY "${PROJECT_DIRECTORY}" + ) +endforeach(file ${ex_to_svg}) add_custom_command(TARGET install-simgrid -COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/examples -COMMAND echo "cp --parents -f ${ex_to_svg} $ENV{DESTDIR}${prefix}/doc/simgrid/" -COMMAND cp --parents -f ${ex_to_svg} $ENV{DESTDIR}${prefix}/doc/simgrid/examples -COMMAND echo "install examples ok" -WORKING_DIRECTORY "${PROJECT_DIRECTORY}" + COMMAND echo "install doc/examples OK" + WORKING_DIRECTORY "${PROJECT_DIRECTORY}" ) + add_custom_target(uninstall COMMAND rm -rf ${prefix}/doc/simgrid COMMAND echo "uninstall doc ok" @@ -102,7 +104,7 @@ WORKING_DIRECTORY "${prefix}" if(HAVE_JAVA) add_custom_command(TARGET install-simgrid - COMMAND echo "install binding java" + COMMAND echo "install binding java OK" COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/share/ COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar $ENV{DESTDIR}${prefix}/share/simgrid.jar WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" @@ -116,7 +118,7 @@ endif(HAVE_JAVA) if(HAVE_LUA) add_custom_command(TARGET install-simgrid - COMMAND echo "install binding lua" + COMMAND echo "install binding lua OK" COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/lib/lua/5.1/ COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/lua/5.1/simgrid.so WORKING_DIRECTORY "${PROJECT_DIRECTORY}/" @@ -130,7 +132,7 @@ endif(HAVE_LUA) if(HAVE_RUBY) add_custom_command(TARGET install-simgrid - COMMAND echo "install binding ruby" + COMMAND echo "install binding ruby OK" COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/ COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/libsimgrid.so COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/simgrid.rb -- 2.20.1