X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FNewProject%2Fdoc%2Ftemplate_WebSite%2FCMakeLists.txt;h=09ed25dcc9bb084b00ec2cc40fe8fc03101ff308;hb=c44dcd536c7fefc05d662cc7215cf754e8fbdcb0;hp=1927a136e95b43e3e454f8a7076c250ee3d6ebd5;hpb=ffb107c70599958fb9104057e52aa24bc2f03696;p=crea.git

diff --git a/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt
index 1927a13..09ed25d 100644
--- a/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt
+++ b/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt
@@ -3,7 +3,7 @@ MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "Configuring User html doc")
 
 # Configure & install images 
-CREANEWPROJECT_DOC_INSTALL(template_WebSite)
+USER_DOC_INSTALL_IMAGES(template_WebSite)
 
 # Configure html pages for build tree and install 
 FILE(GLOB HTML_PAGES "." "*.html")
@@ -11,62 +11,15 @@ FOREACH(page ${HTML_PAGES})
   GET_FILENAME_COMPONENT(filename "${page}" NAME)
   CONFIGURE_FILE(
     ${page}
-    ${BBTK_DOC_BUILD_PATH}/template_WebSite/${filename}
+    ${${PROJECT_NAME}_DOC_BUILD_PATH}/template_WebSite/${filename}
     @ONLY
     )
   # Install
   INSTALL(
-    FILES ${BBTK_DOC_BUILD_PATH}/template_WebSite/${filename}
-    DESTINATION ${BBTK_DOC_INSTALL_PATH}/template_WebSite
+    FILES ${${PROJECT_NAME}_DOC_BUILD_PATH}/template_WebSite/${filename}
+    DESTINATION ${${PROJECT_NAME}_DOC_INSTALL_PATH}/template_WebSite
     )
 ENDFOREACH(page)
 
-
-#===================================================================
-# Regenerate package doc / boxes lists
-# Must be made manually as:
-# 1) Is useless for installers (it is to be run after install)
-# 2) Can be done manually for a build tree (e.g. in bbStudio)
-IF(FALSE)
-
-SET(INDEX_OUTPUT index-alpha.html)
-
-IF (WIN32)
-  
-  SET(USE_DOT TRUE)
-  MAKE_DLL_PATH()
-
-   ADD_CUSTOM_COMMAND(
-     OUTPUT ${INDEX_OUTPUT}
-         COMMAND 
-     set Path=${DLL_PATH} && cd ${BBTK_BIN_PATH} && bbRegeneratePackageDoc -a -q &&  bbRegenerateBoxesLists -q
-
-    DEPENDS ${BBTK_PACKAGES_DEPS}
-          )
-
-ELSE (WIN32)
-  
-  #     MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}")
-  
-  SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-  #   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
-  
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${INDEX_OUTPUT}
-    COMMAND 
-    
-    cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ./bbRegeneratePackageDoc -a -q &&  ./bbRegenerateBoxesLists -q
-    
-    DEPENDS ${BBTK_PACKAGES_DEPS} bbRegeneratePackageDoc bbRegenerateBoxesLists
-    )
-  
-ENDIF (WIN32)
-
-ADD_CUSTOM_TARGET(
-  bbdoc ALL
-  DEPENDS ${INDEX_OUTPUT}
-  )
-	   
-ENDIF(FALSE)
 	   
 MESSAGE(STATUS "=======================================")