From: Arnaud Giersch Date: Thu, 16 May 2019 09:49:25 +0000 (+0200) Subject: Don't install empty doc/html/. X-Git-Tag: v3.22.4~125^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/12e502742be678b40d9aa89db6abff76b36e62f8 Don't install empty doc/html/. Fix simgrid/simgrid#14 (FramaGit). --- diff --git a/ChangeLog b/ChangeLog index 8563016dc7..f739415bd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ Fixed bugs (GH=GitHub; FG=FramaGit): - FG#11: Auto-restart actors forget their on_exit behavior - FG#12: -Denable_lto=OFF doesn't disable LTO - FG#13: Installs unstripped file 'bin/graphicator' + - FG#14: Installs the empty directory 'doc/simgrid/html' - GH#133: Java : a process can run on a VM even if its host is off - GH#326: Valgrind-detected error for join() when energy plugin is activated diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index c3d372a25f..10fa30ab7f 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -3,9 +3,7 @@ ######################################### # doc -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/doc/html/) -install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/" - DESTINATION doc/simgrid/html/) +install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/" DESTINATION doc/simgrid/html/ OPTIONAL) # binaries if(enable_smpi)