From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 9 Apr 2010 14:35:46 +0000 (+0000)
Subject: Remove old libsimgrid_ruby to install.
X-Git-Tag: SVN~216
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f97ab49c1047d61b59308c204d6201a509040596

Remove old libsimgrid_ruby to install.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a181e7ec..f834750926 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
-set_property(GLOBAL PROPERTY Label "${SVN_VERSION}${GIT_VERSION}")
 
 ### Find programs and paths
 find_program(SH_EXE NAMES sh)
diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 5229b31d08..48b7508f28 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -317,12 +317,6 @@ ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*
 ${PROJECT_DIRECTORY}/src/.libs/libgras.*
 ${PROJECT_DIRECTORY}/src/.libs/libsmpi.*
 )
-if(HAVE_RUBY)
-	set(install_libs
-	${install_libs}
-	${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.*
-	)
-endif(HAVE_RUBY)
 
 set(install_HEADERS
 ./include/gras.h 
diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 5398f118df..a8356be90e 100644
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -5,7 +5,11 @@ set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 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})