Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix Bibtex2html pb.
[simgrid.git] / buildtools / Cmake / src / CMakeDistrib.txt
index 53cf30c..180cd95 100644 (file)
@@ -3,7 +3,7 @@ set(simgrid_version "3.3.5")
 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}_rev_${SVN_VERSION}${GIT_VERSION}")
+set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}")
 set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
 
 set(to_svg     
@@ -93,7 +93,8 @@ COMMAND echo "TODO"
 
 add_custom_target(html
 COMMAND echo "Make the html doc"
-COMMAND cmake ./
+COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
+COMMAND cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./
 COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
 COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake