Merge branch 'vtk8itk4wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/bbtk into vtk8it...

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index b1513644ce7fadb5245b3329b8d247cf375c8375..8c6a06c597517837887a3e110e1e346aae37a6bf 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -118,10 +118,10 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT} 
        COMMAND echo ${BBFY_CXX_OUT}
-       COMMAND  echo set "Path=${crea_DIR}/bin/\;"${DLL_PATH} 
+       COMMAND  echo set "Path=${crea_DIR}/bin/\;"${DLL_PATH}\;
        COMMAND  echo ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
 ##     COMMAND echo ${BBFY_CXX_OUT}
-       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH}\; && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
  ##  COMMAND  set Path=${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY}
@@ -323,7 +323,7 @@ IF (WIN32)
 ADD_CUSTOM_COMMAND(
 ##    OUTPUT ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp
         TARGET bb${BBTK_PACKAGE_NAME} POST_BUILD
-        COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+        COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH}\; && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
 ##             DEPENDS ${BBTK_BBPCONFIGURATOR_DEPENDENCY} 
          ) 
     add_dependencies( bb${BBTK_PACKAGE_NAME}  bbpConfigurator )

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 8b1c2ae0f58bb5515725f0b47dff38eaa0d79c03..cde367b7854638c07afa6eb560d325d5a086e56f 100644 (file)
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -85,7 +85,7 @@ MACRO(MAKE_DLL_PATH)
     FOREACH(APATH $ENV{PATH})
          SET(DLL_PATHA ${DLL_PATHA}__RR__${APATH})
     ENDFOREACH(APATH)
-    STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATHA} )
+    STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATHA} )       
   ENDIF(WIN32)  
 ENDMACRO(MAKE_DLL_PATH)
 #========================================================================