From eed4a68ed3d379b6d3060e7a3730d12fa806b1ed Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 13 May 2008 05:50:25 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage_src.cmake | 14 +++++++------- kernel/doc/bbtkWebSite/CMakeLists.txt | 11 ++++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index b6a16eb..d447c98 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -78,17 +78,17 @@ 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% ) + 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 " " ) + SET(SETPATH "set ${command0} &&") + ELSE(WIN32) + SET(SETPATH "") ENDIF(WIN32) ADD_CUSTOM_COMMAND( OUTPUT ${BBFY_CXX_OUT} - COMMAND - set ${command0} && - ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q + COMMAND + ${SETPATH} ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q DEPENDS ${xmlfile} ${BBTK_BBFY_DEPENDENCY} ) @@ -99,7 +99,7 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES}) # IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") - message ("EED Alert BBTKConfigurePackage_src " "IF NOT MATCHES" ) + # message ("EED Alert BBTKConfigurePackage_src " "IF NOT MATCHES" ) SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES ${${BBTK_PACKAGE_NAME}_CXX_SOURCES} ${filename} diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index b421d8b..cb28334 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -32,14 +32,19 @@ 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% ) + +IF (WIN32) + SET(command00 Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% ) STRING(REPLACE "__RR__" "\;" command0 ${command00} ) + SET(SETPATH "set ${command0} &&") +ELSE (WIN32) + SET(SETPATH "") +ENDIF (WIN32) ADD_CUSTOM_COMMAND( OUTPUT ${INDEX_OUTPUT} COMMAND - set ${command0} && cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs + ${SETPATH} 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 -- 2.45.1