X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17f966eb23cc283701f1334ba7a6f023753ac182..9b733f0e8b01f655eb882b9ec6047314ada533b9:/buildtools/Cmake/src/CMakeDistrib.txt

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index ab7e562265..caa7075b66 100755
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -1,9 +1,7 @@
-set(simgrid_version "3.4")
-
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 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_PACKAGE_FILE_NAME "simgrid-${release_version}~${SVN_VERSION}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 
 foreach(file ${script_to_install})
@@ -68,7 +66,7 @@ COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR
 COMMAND echo "install bin           OK"
 COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib
 COMMAND echo "install lib           OK"
-COMMAND cp --parent ${install_HEADERS} $ENV{DESTDIR}${prefix}
+COMMAND cp ${install_HEADERS} $ENV{DESTDIR}${prefix}
 COMMAND echo "install include       OK"
 COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ $ENV{DESTDIR}${prefix}/doc/simgrid
 COMMAND echo "install doc/html      OK"
@@ -78,7 +76,7 @@ WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 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/
+		COMMAND cp -f ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/
 		WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 	)
 endforeach(file ${ex_to_svg})
@@ -162,6 +160,12 @@ COMMAND make package
 COMMAND rm -rf _CPack_Packages
 #WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
+
+add_custom_target(check
+COMMAND make test
+#WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+
 add_custom_target(distcheck
 COMMAND make package
 COMMAND rm -rf _CPack_Packages
@@ -249,8 +253,12 @@ COMMAND make clean
 COMMAND make java-clean
 COMMAND make doc-clean
 COMMAND make supernovae-clean
-COMMAND make maintainer-clean
 )
+if(enable_maintainer_mode)
+	add_custom_command(TARGET all-clean
+	COMMAND make maintainer-clean
+	)
+endif(enable_maintainer_mode)
 
 add_custom_target(sync-gforge
 COMMAND chmod g+rw -R doc/