]> Creatis software - bbtk.git/commitdiff
#3239 BBTK Bug New Normal - dlls conflict with bbfy in compilation (windows XP )
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 20 Mar 2019 10:45:28 +0000 (11:45 +0100)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 20 Mar 2019 10:45:28 +0000 (11:45 +0100)
kernel/cmake/BBTKConfigurePackage_src.cmake
kernel/cmake/BBTKMacros.cmake

index b151364..8ec01de 100644 (file)
@@ -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}
index 8b1c2ae..cde367b 100644 (file)
@@ -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)
 #========================================================================