(try to) generate doc :-(

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8eba108001f8ebd7d730c037a8bb89a25900915..f8591a0558cc1e0121339c5b62d6c0b9095a798e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 # for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
 IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
   CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0011 NEW)
   CMAKE_POLICY(SET CMP0005 NEW)  
+  CMAKE_POLICY(SET CMP0011 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
 ###################################

diff --git a/cmake/UserBuildDoxygenDoc.cmake b/cmake/UserBuildDoxygenDoc.cmake
index 24466711448ca6c14ac112214c1911fe05cb639b..4ecbfeb1c496c67b0e0e82f2a21354c9fca82958 100644 (file)
--- a/cmake/UserBuildDoxygenDoc.cmake
+++ b/cmake/UserBuildDoxygenDoc.cmake
@@ -49,7 +49,6 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
     @ONLY IMMEDIATE
     )
  
-  
   ADD_CUSTOM_COMMAND(
     OUTPUT ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html
     COMMAND 
@@ -58,7 +57,7 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
     ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.txt
     #  DEPENDS bbtk bbi 
     )
-  
+
   ADD_CUSTOM_TARGET(doxygen_${NAME} ALL
     DEPENDS  ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html
     )

diff --git a/doc/README_HowToUpload.txt b/doc/README_HowToUpload.txt
index a6bf91cf830f4b970a677c97099015a89f3a9869..0dcfc21eec496b8338238e0be05da2b8b1b3fe4a 100644 (file)
--- a/doc/README_HowToUpload.txt
+++ b/doc/README_HowToUpload.txt
@@ -2,4 +2,4 @@ After builing ALL :
 
 cd in the build tree
 cd share/doc
-rsync -rtvO  . tux:/var/www/html/software/creatools/bbtk/v0_9_0/ --perms --chmod=Dg+s,ug+w
+rsync -rtvO  . tux:/var/www/html/software/public/creatools/bbtk/v0_9_0/ --perms --chmod=Dg+s,ug+w

diff --git a/doc/UserDoxygen/CMakeLists.txt b/doc/UserDoxygen/CMakeLists.txt
index 9fab474d25767b720c0f5088b2e1d00cfac650d4..c90be3ec4cd03f2f7fd4768fe74733cf1a065ea9 100644 (file)
--- a/doc/UserDoxygen/CMakeLists.txt
+++ b/doc/UserDoxygen/CMakeLists.txt
@@ -15,8 +15,14 @@ CONFIGURE_FILE(
 
 SET(INPUT 
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${PROJECT_SOURCE_DIR}/lib
+  ${PROJECT_SOURCE_DIR}/lib  
+  # --> Add here more library directories if you want them to be documented!
+  ${PROJECT_SOURCE_DIR}/lib/src1
+    
   ${PROJECT_SOURCE_DIR}/appli
+    # --> Add here more appli directories if you want them to be documented!
+  ${PROJECT_SOURCE_DIR}/appli/testBruker2Dicom
+  ${PROJECT_SOURCE_DIR}/appli/PrintParameterFile  
   )
 
 INCLUDE(../../cmake/UserBuildDoxygenDoc.cmake)
@@ -26,5 +32,4 @@ USER_BUILD_DOXYGEN_DOC(
   "${PROJECT_NAME}" 
   "${DOXYGEN_DOC_PREDEFINED}"
   )
-
 MESSAGE(STATUS "=======================================")