From 93db403fd2b6666c60754c6169e6211bce974044 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 1 Dec 2010 13:08:27 +0000 Subject: [PATCH] Also copy doc when disable. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8804 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/Distrib.cmake | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 165b9d2b45..63bf14bff0 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -3,18 +3,16 @@ ######################################### # doc -if(enable_doc) - if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/) - file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/) - endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/) - install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/" - DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/" - PATTERN ".svn" EXCLUDE - PATTERN ".git" EXCLUDE - PATTERN "*.o" EXCLUDE - PATTERN "*~" EXCLUDE - ) -endif(enable_doc) +if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/) + file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/) +endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/) +install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/" + DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/" + PATTERN ".svn" EXCLUDE + PATTERN ".git" EXCLUDE + PATTERN "*.o" EXCLUDE + PATTERN "*~" EXCLUDE +) # binaries install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc @@ -169,7 +167,7 @@ COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h -COMMAND ${CMAKE_COMMAND} -E echo "uninstal include ok" +COMMAND ${CMAKE_COMMAND} -E echo "uninstall include ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) -- 2.20.1