From 7785d9f3ee33f106ad64a204d8cef883185180b0 Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 6 Oct 2008 09:01:00 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage_src.cmake | 3 ++- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 7 ++----- kernel/cmake/BBTKFindLibraries.cmake | 10 ---------- kernel/cmake/BBTKKernelConfig.cmake | 1 + kernel/cmake/BBTKMacros.cmake | 20 ++++++++++++++++++++ kernel/cmake/BBTKSetDeducedPaths.cmake | 8 -------- kernel/doc/bbtkWebSite/CMakeLists.txt | 6 +++--- packages/vtk/src/bbvtkImagePlanes.cxx | 10 +++++----- 8 files changed, 33 insertions(+), 32 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 241faa3..494d9ff 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -74,13 +74,14 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES}) SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx) IF (WIN32) + MAKE_DLL_PATH() # 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 ${CREA_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q + set ${DLL_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 c00536e..47f7aad 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -31,10 +31,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) # IF(WIN32) 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} ) - + MAKE_DLL_PATH() # 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 ) @@ -48,7 +45,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) OUTPUT ${DOC_OUTPUT} COMMAND # cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE} - set ${CREA_PATH} && ${command1} && ${command2} && ${command3} + set ${DLL_PATH} && ${command1} && ${command2} && ${command3} #&& ${command4} DEPENDS bb${PACKAGE_NAME} ) diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index 8a9eec7..21d8599 100644 --- a/kernel/cmake/BBTKFindLibraries.cmake +++ b/kernel/cmake/BBTKFindLibraries.cmake @@ -170,16 +170,6 @@ IF(USE_DOXYGEN) ENDIF(USE_DOXYGEN) #----------------------------------------------------------------------------- -#----------------------------------------------------------------------------- -IF(USE_DOT) - IF(WIN32) - FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} ) - IF(NOT DOT_DIR) - MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe") - ENDIF(NOT DOT_DIR) - ENDIF(WIN32) -ENDIF(USE_DOT) -#----------------------------------------------------------------------------- #----------------------------------------------------------------------------- IF(USE_LATEX) diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 1600776..27149d4 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -19,6 +19,7 @@ SET(BBTK_CORE_PACKAGE TRUE) IF(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") + SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls") ELSE(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH bin) SET (LIBRARY_OUTPUT_REL_PATH bin) diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake index 7812755..3cfa5f4 100644 --- a/kernel/cmake/BBTKMacros.cmake +++ b/kernel/cmake/BBTKMacros.cmake @@ -81,3 +81,23 @@ MACRO(MKDIR DIR) ENDIF(NOT IS_DIRECTORY ${DIR}) ENDMACRO(MKDIR) #======================================================================== + + +#======================================================================== +MACRO(MAKE_DLL_PATH) + IF(WIN32) + IF(NOT DLL_PATH) + IF(USE_DOT) + FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} ) + IF(NOT DOT_DIR) + MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe") + ELSE(NOT DOT_DIR) + MESSAGE(STATUS "Looking for dot... - found in ${DOT_DIR}") + ENDIF(NOT DOT_DIR) + ENDIF(USE_DOT) + SET(DLL_PATH0 Path=${ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR}) + STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATH0} ) + ENDIF(NOT DLL_PATH) + ENDIF(WIN32) +ENDMACRO(MAKE_DLL_PATH) +#======================================================================== diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake index 914e4dd..97b484d 100644 --- a/kernel/cmake/BBTKSetDeducedPaths.cmake +++ b/kernel/cmake/BBTKSetDeducedPaths.cmake @@ -63,13 +63,5 @@ ENDIF(BBTK_CORE_PACKAGE) #----------------------------------------------------------------------------- -#----------------------------------------------------------------------------- -IF(WIN32) - SET(CREA_ADDITIONAL_DLL_PATH "C:/CreaTools/lib" 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 6b21b38..b392128 100644 --- 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(USE_DOT TRUE) + MAKE_DLL_PATH() ADD_CUSTOM_COMMAND( OUTPUT ${INDEX_OUTPUT} COMMAND - set ${CREA_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs + set ${DLL_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) diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index a3b858d..ed7cb86 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.cxx,v $ Language: C++ - Date: $Date: 2008/06/25 08:21:31 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/10/06 09:01:08 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -114,9 +114,9 @@ namespace bbvtk //--------------------------------------------------------------------- void ImagePlanes::bbUserDestructor() { - planeWidgetX->Delete(); - planeWidgetY->Delete(); - planeWidgetZ->Delete(); + if (bbGetOutputPlaneX()) bbGetOutputPlaneX()->Delete(); + if (bbGetOutputPlaneY()) bbGetOutputPlaneY()->Delete(); + if (bbGetOutputPlaneZ()) bbGetOutputPlaneZ()->Delete(); } //--------------------------------------------------------------------- -- 2.45.0