*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index d4fac9cb3e820695936505cb266d0199ae3d3a62..241faa34cf27ee9af41bbf253cf36299a49d7664 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -74,13 +74,13 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   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__" "\;" SETPATH ${command00} )
-       #    SET(SETPATH set ${command0} &&)
+ #   SET(command00 Path=c:/creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
+ #   STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
+ #   SET(SETPATH set ${command0} &&)
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    set ${SETPATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    set ${CREA_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index 370281d6bacccd499135a39038042b0c300b96b6..c00536ea8b7b255c44526b09a48e7b2c9d8f6a42 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -30,26 +30,26 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
 
   #
   IF(WIN32)
-  
-    FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
-    IF(NOT DOT_DIR)
-               MESSAGE(FATAL_ERROR "DOT NOT FOUND")
-    ENDIF(NOT DOT_DIR)
-       # %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} ) 
+    SET(USE_DOT TRUE)
+    # %DOT_DIR%
+    # set(command00  Path=C:/Creatis/dlls__RR__%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 ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )   
-    set(command1 cd "${EXECUTABLE_OUTPUT_PATH}/../bbs/") 
-    set(command2 copy ${pathCommand2} . )
+#    FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )  
+    FILE(TO_NATIVE_PATH  ${BBTK_BIN_PATH}/bbtk_config.xml pathCommand2 )       
+    FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH} pathCommand1 )
+    set(command1 cd ${pathCommand1}) 
+    set(command2 copy ${pathCommand2} . )   
     set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) 
-    set(command4 del bb${BBTK_PACKAGE_NAME}.dll)
+    set(command4 echo done)
+    #del bb${BBTK_PACKAGE_NAME}.dll)
     
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
       #    cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE}
-      set ${command0} && ${command1} && ${command2} && ${command3} && ${command4}
+      set ${CREA_PATH} && ${command1} && ${command2} && ${command3} 
+      #&& ${command4}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ELSE(WIN32)

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index fae2ed86984fce00c167666c197f4fecef65a128..27b1d3a0ec1ad116e92407fc28cf0122bf493ea8 100644 (file)
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -62,3 +62,20 @@ IF(BBTK_CORE_PACKAGE)
 ENDIF(BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------
 
+
+#-----------------------------------------------------------------------------
+IF(WIN32)
+IF(USE_DOT)
+  FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
+  IF(NOT DOT_DIR)
+    MESSAGE(FATAL_ERROR "Dot not found")
+  ENDIF(NOT DOT_DIR)
+ENDIF(USE_DOT) 
+SET(CREA_ADDITIONAL_DLL_PATH "C:/Creatis/dlls" CACHE PATH "Addictional paths in which to look for dlls")
+SET(CREA_PATH0 Path=${CREA_ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
+STRING(REPLACE "__RR__" "\;" CREA_PATH ${CREA_PATH0} )
+ENDIF(WIN32)
+#-----------------------------------------------------------------------------
+
+
+

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index ca5ff4788d3f8d7b0d6278fc35311bd1c92bff38..6b21b387e2765a2ed5c02be5aec2419cb1db8b8e 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -34,12 +34,12 @@ CONFIGURE_FILE(
   )
 
 IF (WIN32)
-  SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
-  STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
+ # 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 
-    set ${command0} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    set ${CREA_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
     DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ELSE (WIN32)