*** empty log message ***

diff --git a/INSTALL.txt b/INSTALL.txt
index 26f4c41ed7543aedac693402c71ef9bd6d63dd49..e95045acd411a98ec6a1cc1805a97309b57e52ae 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -33,7 +33,35 @@ OR
 type root password
 > bbtk-uninstall
 
+
+
 *************
 ** WINDOWS **
 *************
-TO DO
+
+1)
+INSTALL SOFA
+   (See enviremental variables  VTK ITK GDCM WXWIN ..)
+
+2)
+Install from 
+  http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/
+       -basic-miktex-2.6.2742.exe
+         (You have to make update) 
+       -tth_exe.zip     (c:\Creatis\tth_exe)
+  http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/new/
+       -graphviz-2.2.1.exe
+       -doxygen-1.5.3-setup.exe
+
+
+3) 
+Set the global variables of windows
+ Start
+  -> Control Panel
+    -> System
+     -> Advance
+      -> Environment Variables
+Ex.
+
+CREATIS        = c:\Creatis\
+

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 2940f82957eea00c355f04b93be1c1454d08db8b..b6a16eba6e672b00559d2a2225c79fb4dfe4418b 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -75,12 +75,19 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   
   GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) 
   
-  
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
+  IF (WIN32)
+    set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
+    STRING(REPLACE "__RR__" "\;" command0 ${command00} )
+  ELSEIF(WIN32)
+    set(command0 " " )      
+  ENDIF(WIN32)
+  
   ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND 
+       set ${command0}  && 
     ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
@@ -91,17 +98,17 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
     PROPERTIES GENERATED ON)
   
   
-  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
-    SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
+ #  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
+  message ("EED Alert BBTKConfigurePackage_src  "  "IF NOT MATCHES" )
+  SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
       ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
       ${filename}
       )
-  ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") 
+#  ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") 
   
   INSTALL(
     FILES       ${CMAKE_CURRENT_BINARY_DIR}/${filename}.h 
     DESTINATION include/bb${BBTK_PACKAGE_NAME})  
-
 ENDFOREACH(xmlfile)
 #----------------------------------------------------------------------------
 

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index 2f6c9582dabac4eb626139d583292cc1dc913886..36cd4c9f796426336701146c777718f9d0aa4283 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -29,7 +29,13 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
   
   #
   IF(WIN32)
-    FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )
+  
+    FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
+       # %DOT_DIR%
+    set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__${DOT_DIR}__RR__%PATH% )
+    STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
+ 
+    FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )    
     set(command1 cd "${BBTK_BIN_PATH}/../bbs/") 
     set(command2 copy ${pathCommand2} . )
     set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) 
@@ -39,7 +45,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
       #    cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE}
-      ${command1} && ${command2} && ${command3} && ${command4}
+      set ${command0} && ${command1} && ${command2} && ${command3} && ${command4}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ELSE(WIN32)

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 38fbf990cd3a327017e7f3916a4bdaed012eed51..a4e3dcb09c466634c5ed260090be7dd71a8896e4 100644 (file)
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -156,7 +156,7 @@ ENDIF(USE_LATEX)
 
 #-----------------------------------------------------------------------------
 IF(USE_TTH) 
-  FIND_FILE(LATEX_tth_CONVERTER NAME tth tth.exe PATHS . c:/Creatis/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux)
+  FIND_FILE(LATEX_tth_CONVERTER NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux)
   IF (NOT LATEX_tth_CONVERTER)
     MESSAGE(FATAL_ERROR "TTH not found (LATEX_tth_CONVERTER). Required to build the HTML documentation from tex source")
   ELSE (NOT LATEX_tth_CONVERTER)

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 443fe6dd2daf1186f42fb2c45318a6403b876655..b421d8b9bd0d8e927db1f4b0ea4f56bc6efe1863 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -32,10 +32,14 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
   @ONLY
   )
+  
+  set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
+  STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
+
 ADD_CUSTOM_COMMAND(
   OUTPUT ${INDEX_OUTPUT}
   COMMAND 
-  cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+  set ${command0} && cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
   DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ADD_CUSTOM_TARGET(bbdoc_index ALL