From 7734c1383e7fe83deec7ca65273b96cd9240691a Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 20 Mar 2019 11:45:28 +0100 Subject: [PATCH] #3239 BBTK Bug New Normal - dlls conflict with bbfy in compilation (windows XP ) --- kernel/cmake/BBTKConfigurePackage_src.cmake | 4 ++-- kernel/cmake/BBTKMacros.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index b151364..8ec01de 100644 --- 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} diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake index 8b1c2ae..cde367b 100644 --- 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) #======================================================================== -- 2.45.1