From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Tue, 2 Jun 2009 14:03:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~25
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9af88b41059637ae03283705a09431386e6e5a9a;hp=ffb107c70599958fb9104057e52aa24bc2f03696;p=crea.git

*** empty log message ***
---

diff --git a/appli/creaNewProject/NewProject/cmake/UserDefineOptions.cmake b/appli/creaNewProject/NewProject/cmake/UserDefineOptions.cmake
index a6693a9..65a1446 100644
--- a/appli/creaNewProject/NewProject/cmake/UserDefineOptions.cmake
+++ b/appli/creaNewProject/NewProject/cmake/UserDefineOptions.cmake
@@ -30,7 +30,7 @@ ELSE(BUILD_${PROJECT_NAME}_DOC)
       "Build ${PROJECT_NAME} Guides', PDF format (latex)."	FORCE)
   ENDIF(BUILD_${PROJECT_NAME}_DOC_GUIDES_PDF)
   
-  IF(BUILD_BBTK_DOC_GUIDES_HTML)
+  IF(BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML)
     SET(BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML OFF CACHE BOOL 
       "Build ${PROJECT_NAME} Guides', HTML format (latex tth)."		FORCE)
   ENDIF(BUILD_${PROJECT_NAME}_DOC_GUIDES_HTML)
diff --git a/appli/creaNewProject/NewProject/cmake/UserRootCMakeLists.cmake b/appli/creaNewProject/NewProject/cmake/UserRootCMakeLists.cmake
index 8baf8de..d4ee59b 100644
--- a/appli/creaNewProject/NewProject/cmake/UserRootCMakeLists.cmake
+++ b/appli/creaNewProject/NewProject/cmake/UserRootCMakeLists.cmake
@@ -1,4 +1,6 @@
 
-
-INCLUDE(UserSetDeducedPaths.cmake)
-INCLUDE(UserDefineOptions.cmake)
\ No newline at end of file
+INCLUDE(cmake/UserMacros.cmake)
+INCLUDE(cmake/UserConfig.cmake)
+INCLUDE(cmake/UserSetDeducedPaths.cmake)
+INCLUDE(cmake/UserBuildAllOption.cmake)
+INCLUDE(cmake/UserDefineOptions.cmake)
\ No newline at end of file
diff --git a/appli/creaNewProject/NewProject/cmake/creaNewProjectMacros.cmake b/appli/creaNewProject/NewProject/cmake/creaNewProjectMacros.cmake
deleted file mode 100644
index ee18f9f..0000000
--- a/appli/creaNewProject/NewProject/cmake/creaNewProjectMacros.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#========================================================================
-# MACRO WHICH COPIES ALL IMAGES (png, jpg, gif) 
-# FROM SOURCE TREE TO DOC BUILD TREE
-# AND INSTALL THEM IN BBTK DOC TREE
-MACRO(CREANEWPROJECT_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
-  MESSAGE(STATUS "* Copying png,jpg,tif images in ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}")
-  FILE(GLOB PNG_IMAGES "*.png")
-  FILE(GLOB JPG_IMAGES "*.jpg")
-  FILE(GLOB TIF_IMAGES "*.tif")
-  SET(IMAGES
-    ${PNG_IMAGES}
-    ${JPG_IMAGES}
-    ${TIF_IMAGES}
-    )
-#    MESSAGE(ERROR ${IMAGES} )
-  FOREACH(image ${IMAGES})  
-    GET_FILENAME_COMPONENT(filename "${image}" NAME)
-    CONFIGURE_FILE(
-      ${image}
-       ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
-      COPYONLY
-      ) 
-      
-    #  IF (WIN32)
-#	CONFIGURE_FILE(
-#          ${image}
-#          ${CMAKE_CURRENT_BINARY_DIR}/${filename}
-#          COPYONLY
-#	  )
-#      ENDIF(WIN32)
-    # MESSAGE(ERROR "${image} (${filename}) in :  ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}")
-  ENDFOREACH(image)
-  INSTALL( 
-      FILES ${IMAGES} 
-      DESTINATION ${BBTK_DOC_INSTALL_PATH}/${DOC_RELATIVE_INSTALL_PATH}
-    )  
-ENDMACRO(CREANEWPROJECT_DOC_INSTALL_IMAGES)
\ No newline at end of file
diff --git a/appli/creaNewProject/NewProject/doc/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/CMakeLists.txt
index 535e480..db4f378 100644
--- a/appli/creaNewProject/NewProject/doc/CMakeLists.txt
+++ b/appli/creaNewProject/NewProject/doc/CMakeLists.txt
@@ -2,9 +2,9 @@
 
 #-----------------------------------------------------------------------------
 IF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_DOXYGEN)
-  INCLUDE(../cmake/BBTKBuildDoxygenDoc.cmake)
-  SUBDIRS(bbtkDoxygen)
-ENDIF(BUILD_${PROJECT_NAME}_DOC AND BUILD_BBTK_DOC_DOXYGEN)
+  INCLUDE(../cmake/UserBuildDoxygenDoc.cmake)
+  SUBDIRS(UserDoxygen)
+ENDIF(BUILD_${PROJECT_NAME}_DOC AND BUILD_${PROJECT_NAME}_DOC_DOXYGEN)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
diff --git a/appli/creaNewProject/NewProject/doc/bbtkDoxygen/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
old mode 100755
new mode 100644
similarity index 70%
rename from appli/creaNewProject/NewProject/doc/bbtkDoxygen/CMakeLists.txt
rename to appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
index 4218956..9fab474
--- a/appli/creaNewProject/NewProject/doc/bbtkDoxygen/CMakeLists.txt
+++ b/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
@@ -1,6 +1,6 @@
 MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
-MESSAGE(STATUS "Configuring bbtk doxygen doc")
+MESSAGE(STATUS "Configuring user doxygen doc")
 
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/CodingStyle.html
@@ -15,15 +15,15 @@ CONFIGURE_FILE(
 
 SET(INPUT 
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${PROJECT_SOURCE_DIR}/kernel/src
-  ${PROJECT_SOURCE_DIR}/kernel/appli
+  ${PROJECT_SOURCE_DIR}/lib
+  ${PROJECT_SOURCE_DIR}/appli
   )
 
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildDoxygenDoc.cmake)
-BBTK_BUILD_DOXYGEN_DOC(
-  "BBTK" 
+INCLUDE(../../cmake/UserBuildDoxygenDoc.cmake)
+USER_BUILD_DOXYGEN_DOC(
+  "${PROJECT_NAME}" 
   "${INPUT}" 
-  "bbtk" 
+  "${PROJECT_NAME}" 
   "${DOXYGEN_DOC_PREDEFINED}"
   )
 
diff --git a/appli/creaNewProject/NewProject/doc/bbtkDoxygen/CodingStyle.html b/appli/creaNewProject/NewProject/doc/UserDoxygen/CodingStyle.html
similarity index 100%
rename from appli/creaNewProject/NewProject/doc/bbtkDoxygen/CodingStyle.html
rename to appli/creaNewProject/NewProject/doc/UserDoxygen/CodingStyle.html
diff --git a/appli/creaNewProject/NewProject/doc/bbtkDoxygen/DoxyMainPage.txt.in b/appli/creaNewProject/NewProject/doc/UserDoxygen/DoxyMainPage.txt.in
similarity index 100%
rename from appli/creaNewProject/NewProject/doc/bbtkDoxygen/DoxyMainPage.txt.in
rename to appli/creaNewProject/NewProject/doc/UserDoxygen/DoxyMainPage.txt.in
diff --git a/appli/creaNewProject/NewProject/doc/bbtkDoxygen/Doxyfile.txt.in b/appli/creaNewProject/NewProject/doc/UserDoxygen/Doxyfile.txt.in
similarity index 100%
rename from appli/creaNewProject/NewProject/doc/bbtkDoxygen/Doxyfile.txt.in
rename to appli/creaNewProject/NewProject/doc/UserDoxygen/Doxyfile.txt.in
diff --git a/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/template_WebSite/CMakeLists.txt
index 1927a13..942d018 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")