Add binaries to install.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7525 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f834750..0cb1bd6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,9 +60,10 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
 ### Print ARGS
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
 
-### Make Docs
-if(enable_maintainer_mode)
-       #include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
-endif(enable_maintainer_mode)
+set_property(GLOBAL PROPERTY LABELS "${SVN_VERSION}${GIT_VERSION}")
+set_property(GLOBAL PROPERTY PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}")
+set(PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}")
 
 INCLUDE(Dart)
+
+

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 48b7508..a73623e 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -309,6 +309,9 @@ ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
 set(install_bins
 ${PROJECT_DIRECTORY}/src/smpi/smpicc
 ${PROJECT_DIRECTORY}/src/smpi/smpirun
+${PROJECT_DIRECTORY}/tools/gras/gras_stub_generator
+${PROJECT_DIRECTORY}/tools/tesh/tesh
+${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl
 )
 
 set(install_libs

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index a8356be..96c3957 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -6,10 +6,6 @@ set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 
-set_property(GLOBAL
-PROPERTY Label "${SVN_VERSION}${GIT_VERSION}"
-)
-
 foreach(file ${script_to_install})
        get_filename_component(file_location ${file} PATH)
        string(REPLACE "${PROJECT_DIRECTORY}/" "/" file_location ${file_location})
@@ -62,6 +58,7 @@ COMMAND mkdir -p ${prefix}/doc
 COMMAND mkdir -p ${prefix}/doc/simgrid
 COMMAND mkdir -p ${prefix}/doc/simgrid/html
 COMMAND cp ${install_bins} ${prefix}/bin
+COMMAND mv ${prefix}/bin/colorize.pl ${prefix}/bin/simgrid_colorizer.pl
 COMMAND echo "install bin ok"
 COMMAND cp ${install_libs} ${prefix}/lib
 COMMAND echo "install lib ok"