*** empty log message ***

diff --git a/AdditionalUsecrea.cmake.in b/AdditionalUsecrea.cmake.in
index 60fe82062d2d681371ae82b5d57e020e9e034df3..e7ac676f3178d0888ad945ef94e2adf27ebe7c55 100644 (file)
--- a/AdditionalUsecrea.cmake.in
+++ b/AdditionalUsecrea.cmake.in
@@ -1,3 +1,4 @@
 
+INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)

diff --git a/AdditionalcreaConfig.cmake.in b/AdditionalcreaConfig.cmake.in
index 3af959d843fd227348800b6b7e37dc79de7cd6fd..ca0f68cb0a33046ec8786a7966807239848169a3 100644 (file)
--- a/AdditionalcreaConfig.cmake.in
+++ b/AdditionalcreaConfig.cmake.in
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------
+SET(CREA_BUILT_WITH_WX @CREA_BUILT_WITH_WX@)
+SET(CREA_BUILT_WITH_VTK @CREA_BUILT_WITH_VTK@)
 SET(CREA_CMAKE_REL_PATH @CREA_CMAKE_REL_PATH@)
 SET(CREA_CMAKE_DIR ${crea_DIR}/${CREA_CMAKE_REL_PATH})
 #-----------------------------------------------------------------------------
@@ -10,7 +12,8 @@ SET(CREA_COMPILE_ERROR_MESSAGES @CREA_COMPILE_ERROR_MESSAGES@)
 
 #-----------------------------------------------------------------------------
 IF(CREA_VERBOSE_CMAKE)
-#  MESSAGE(STATUS "* CREA_BUILT_WITH_WX            = ${CREA_BUILT_WITH_WX}")
+  MESSAGE(STATUS "* CREA_BUILT_WITH_WX            = ${CREA_BUILT_WITH_WX}")
+  MESSAGE(STATUS "* CREA_BUILT_WITH_VTK           = ${CREA_BUILT_WITH_VTK}")
   MESSAGE(STATUS "* CREA_CMAKE_DIR                = ${CREA_CMAKE_DIR}")
   MESSAGE(STATUS "* CREA_COMPILE_MESSAGES         = ${CREA_COMPILE_MESSAGES}")
   MESSAGE(STATUS "* CREA_COMPILE_WARNING_MESSAGES = ${CREA_COMPILE_WARNING_MESSAGES}")
@@ -19,45 +22,21 @@ IF(CREA_VERBOSE_CMAKE)
 ENDIF(CREA_VERBOSE_CMAKE)
 #-----------------------------------------------------------------------------
 
-# If crea was compiled with WxWidget or vtk then have to find them : for now forced (see root CMakeLists.txt)
-SET(USE_WXWIDGETS ON)
-SET(USE_VTK ON)
-
-INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
-
-#-----------------------------------------------------------------------------
-IF(USE_VTK)
-  # Search VTK
-  FIND_PACKAGE(VTK)
-  # If vtk found
-  IF(VTK_FOUND)
-    MESSAGE ( STATUS "Looking for VTK... found")
-    MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
-    MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
-    INCLUDE(${VTK_USE_FILE})
-    CREA_DEFINE( USE_VTK )
-    SET(VTK_LIBRARIES
-      vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
-      vtkVolumeRendering
-      # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
-      ) 
-    IF(NOT USE_ITK)
-     SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
-    ENDIF(NOT USE_ITK)
-    MARK_AS_ADVANCED(VTK_DIR)
-  ELSE(VTK_FOUND)
-     message(FATAL_ERROR "VTK_DIR not found")
-  ENDIF(VTK_FOUND)
-ENDIF(USE_VTK)
-#-----------------------------------------------------------------------------
-
-
-#-----------------------------------------------------------------------------
-IF(USE_WXWIDGETS)
-  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_wxWidgets.cmake)
-  CREA_FIND_WXWIDGETS()
-  CREA_USE_WXWIDGETS()
-ENDIF(USE_WXWIDGETS)
-#-----------------------------------------------------------------------------
+# If crea was compiled with WxWidget or vtk then have to find them : for now forced (see root CMakeLists.txt)  
+IF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK)
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_Define.cmake)
+ENDIF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK)
+IF(CREA_BUILT_WITH_WX)
+  MESSAGE(STATUS "=======================================")
+  MESSAGE(STATUS "crea was built with wxWidgets: have to find it...")
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
+  CREA_FIND_AND_USE_WXWIDGETS()
+ENDIF(CREA_BUILT_WITH_WX)
+IF(CREA_BUILT_WITH_VTK)
+  MESSAGE(STATUS "=======================================")
+  MESSAGE(STATUS "crea was built with VTK: have to find it...")
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake)
+  CREA_FIND_AND_USE_VTK()
+ENDIF(CREA_BUILT_WITH_VTK)
 
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b533672a986955f71a60cdefacde7394e2b47bf..75e82dbfedabc22d5a84e4024072ebe3426ac5cd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,27 +1,27 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
-
-# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
-IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0005 NEW)
-ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-
-
-
 PROJECT(crea)
 
 INCLUDE(Version.cmake)
 SET(CREA_VERBOSE_CMAKE TRUE)
 SET(CREA_CMAKE_REL_PATH cmake)
 SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH})
+INCLUDE(${CREA_CMAKE_DIR}/CREACMakeSettings.cmake)
 INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
 CREA_PREVENT_IN_SOURCE_BUILD()
 
-SET(USE_VTK ON)
+OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
+IF(CREA_BUILD_VTK)
+  SET(USE_VTK ON)
+  SET(CREA_BUILT_WITH_VTK ON)
+ENDIF(CREA_BUILD_VTK)
 #SET(USE_BOOST ON)
-SET(USE_WXWIDGETS ON)
+
+OPTION(CREA_BUILD_WX "Build crea with wxWidgets ?" OFF)
+IF(CREA_BUILD_WX)
+  SET(USE_WXWIDGETS ON)
+  SET(CREA_BUILT_WITH_WX ON)
+ENDIF(CREA_BUILD_WX)
 
 CREA_FIND_AND_USE_LIBRARIES()
 

diff --git a/cmake/CREAMacro_AddExecutable.cmake b/cmake/CREAMacro_AddExecutable.cmake
index 53c6e0f2cddedcce0a3575275987dc4d5e4d5092..34779b08069586894ea0f9e5335db932d0387cbb 100644 (file)
--- a/cmake/CREAMacro_AddExecutable.cmake
+++ b/cmake/CREAMacro_AddExecutable.cmake
@@ -1,9 +1,11 @@
 MACRO(CREA_ADD_EXECUTABLE EXE_NAME)
 
   IF(CREA_VERBOSE_CMAKE)
-    MESSAGE(STATUS "** Creating executable ${EXE_NAME}")
+    MESSAGE(STATUS "===============================================")
+    MESSAGE(STATUS "Configuring executable ${EXE_NAME}")
     MESSAGE(STATUS "   Sources  : ${${EXE_NAME}_SOURCES}")
     MESSAGE(STATUS "   Link libs: ${${EXE_NAME}_LINK_LIBRARIES}")
+    MESSAGE(STATUS "===============================================")
   ENDIF(CREA_VERBOSE_CMAKE)
 
   IF(WIN32)

diff --git a/cmake/CREAMacro_AddLibrary.cmake b/cmake/CREAMacro_AddLibrary.cmake
index ef2fc17777d769c6607253385762101db402c0b2..2aee01c4c3a5972cba51b7ee503479b826edeb56 100644 (file)
--- a/cmake/CREAMacro_AddLibrary.cmake
+++ b/cmake/CREAMacro_AddLibrary.cmake
@@ -1,5 +1,5 @@
 # Creates and installs a library
-# Uses CREA_MANAGE_SHARED_LIBRARY and CREA_INSTALL_LIBRARY
+# Uses CREA_DYNMAIC_LIBRARY_EXPORT and CREA_INSTALL_LIBRARY
 # hence the variables to be set for these are needed 
 # Additionnaly one needs to set :
 # ${LIBRARY_NAME}_HEADERS : the list of headers to install
@@ -8,15 +8,17 @@
 MACRO(CREA_ADD_LIBRARY LIBRARY_NAME)
 
   IF(CREA_VERBOSE_CMAKE)
-    MESSAGE(STATUS "** Creating library ${LIBRARY_NAME}")
+    MESSAGE(STATUS "===============================================")
+    MESSAGE(STATUS "Configuring library ${LIBRARY_NAME}")
     MESSAGE(STATUS "   Headers  : ${${LIBRARY_NAME}_HEADERS}")
     MESSAGE(STATUS "   Sources  : ${${LIBRARY_NAME}_SOURCES}")
     MESSAGE(STATUS "   Link libs: ${${LIBRARY_NAME}_LINK_LIBRARIES}")
+    MESSAGE(STATUS "===============================================")
   ENDIF(CREA_VERBOSE_CMAKE)
 
 
   # MANAGE SHARED LIB
-  CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
+  CREA_DYNAMIC_LIBRARY_EXPORT_OPTION(${LIBRARY_NAME})
 
   # CREATE THE TARGET
   ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES})

diff --git a/cmake/CREAMacro_AddWxExecutable.cmake b/cmake/CREAMacro_AddWxExecutable.cmake
index d3f5556654a9e66204d50481057a829304011b2c..d7ba08b6cad04a9fa5efeceef28c162fa7077b62 100644 (file)
--- a/cmake/CREAMacro_AddWxExecutable.cmake
+++ b/cmake/CREAMacro_AddWxExecutable.cmake
@@ -10,12 +10,14 @@ MACRO(CREA_ADD_WX_EXECUTABLE EXE_NAME)
 
   IF(USE_WXWIDGETS)
     IF(CREA_VERBOSE_CMAKE)
-      MESSAGE(STATUS "** Creating wx executable ${EXE_NAME}")
+      MESSAGE(STATUS "===============================================")
+      MESSAGE(STATUS "Configuring wx executable ${EXE_NAME}")
       MESSAGE(STATUS "   Sources  : ${${EXE_NAME}_SOURCES}")
       MESSAGE(STATUS "   Link libs: ${${EXE_NAME}_LINK_LIBRARIES}")
       IF(WIN32)
        MESSAGE(STATUS "   Console  : ${${EXE_NAME}_CONSOLE}")
       ENDIF(WIN32)
+    MESSAGE(STATUS "===============================================")
     ENDIF(CREA_VERBOSE_CMAKE)
 
 

diff --git a/cmake/CREAMacro_DynamicLibraryExport.cmake b/cmake/CREAMacro_DynamicLibraryExport.cmake
new file mode 100644 (file)
index 0000000..564dd67
--- /dev/null
+++ b/cmake/CREAMacro_DynamicLibraryExport.cmake
@@ -0,0 +1,61 @@
+# Manages the shared library creation/use 
+# * Creates an option ${LIBRARY_NAME}_BUILD_SHARED 
+# * Generates the file ${LIBRARY_NAME}_EXPORT.h which 
+#   defines the symbols ${LIBRARY_NAME}_EXPORT and ${LIBRARY_NAME}_CDECL
+#   to be used in exported classes/functions declarations
+MACRO(CREA_DYNAMIC_LIBRARY_EXPORT_OPTION LIBRARY_NAME)
+
+  # STATIC OR DYNAMIC (SHARED) ? 
+  OPTION( ${LIBRARY_NAME}_BUILD_SHARED 
+    "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
+  IF (${LIBRARY_NAME}_BUILD_SHARED)
+    SET(${LIBRARY_NAME}_SHARED SHARED)
+    CREA_DEFINE(${LIBRARY_NAME}_BUILD_SHARED)
+  ENDIF(${LIBRARY_NAME}_BUILD_SHARED)
+  
+  CREA_DEFINE(${LIBRARY_NAME}_EXPORT_SYMBOLS)
+
+  # ADDS CURRENT BINARY DIR TO INCLUDE DIRS
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+  # CONFIGURES ${LIBRARY_NAME}_EXPORT.h
+  CONFIGURE_FILE(
+    ${CREA_CMAKE_DIR}/LIBRARY_NAME_EXPORT.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_EXPORT.h
+    @ONLY IMMEDIATE
+    )
+  # ADDS IT TO THE LIST OF HEADERS
+  SET(${LIBRARY_NAME}_HEADERS
+    ${${LIBRARY_NAME}_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_EXPORT.h
+    )
+  
+
+ENDMACRO(CREA_DYNAMIC_LIBRARY_EXPORT_OPTION LIBRARY_NAME)
+
+
+# Manages the shared library creation/use 
+# * Generates the file ${LIBRARY_NAME}_EXPORT.h which 
+#   defines the symbols ${LIBRARY_NAME}_EXPORT and ${LIBRARY_NAME}_CDECL
+#   to be used in exported classes/functions declarations
+MACRO(CREA_DYNAMIC_LIBRARY_EXPORT LIBRARY_NAME)
+
+  CREA_DEFINE(${LIBRARY_NAME}_BUILD_SHARED)
+  CREA_DEFINE(${LIBRARY_NAME}_EXPORT_SYMBOLS)
+
+  # ADDS CURRENT BINARY DIR TO INCLUDE DIRS
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+  # CONFIGURES ${LIBRARY_NAME}_EXPORT.h
+  CONFIGURE_FILE(
+    ${CREA_CMAKE_DIR}/LIBRARY_NAME_EXPORT.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_EXPORT.h
+    @ONLY IMMEDIATE
+    )
+  # ADDS IT TO THE LIST OF HEADERS
+  SET(${LIBRARY_NAME}_HEADERS
+    ${${LIBRARY_NAME}_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_EXPORT.h
+    )
+
+ENDMACRO(CREA_DYNAMIC_LIBRARY_EXPORT LIBRARY_NAME)

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index dda7ff9b7f76cca9ec1e40396c807f7f9d4757b5..8d7b05ea2bbe7ee580239093aa9917d5ab8823da 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -4,30 +4,34 @@ MACRO(CREA_FIND_AND_USE_LIBRARIES)
 
 #-----------------------------------------------------------------------------
 IF(USE_VTK)
-  # Search VTK
-  FIND_PACKAGE(VTK)
-  # If vtk found
-  IF(VTK_FOUND)
-    MESSAGE ( STATUS "Looking for VTK... found")
-    MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
-    MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
-    INCLUDE(${VTK_USE_FILE})
-    CREA_DEFINE( USE_VTK )
-    SET(VTK_LIBRARIES
-      vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
-      vtkVolumeRendering
-      # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
-      ) 
-    IF(NOT USE_ITK)
-     SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
-    ENDIF(NOT USE_ITK)
-    MARK_AS_ADVANCED(VTK_DIR)
-  ELSE(VTK_FOUND)
-     message(FATAL_ERROR "VTK_DIR not found")
-  ENDIF(VTK_FOUND)
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake)
+   CREA_FIND_AND_USE_VTK()  
 ENDIF(USE_VTK)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+IF(USE_KW)
+  # Search KWWidgets
+  FIND_PACKAGE(KWWidgets)
+  # If found
+  IF(KWWidgets_FOUND)
+    MESSAGE ( STATUS "=======================================")
+    MESSAGE ( STATUS "Looking for KWWidgets... found")
+    MESSAGE ( STATUS "* Dir     = ${KWWidgets_DIR}")
+    MESSAGE ( STATUS "* Version = ${KWWidgets_MAJOR_VERSION}.${KWWidgets_MINOR_VERSION}.${KWWidgets_BUILD_VERSION}")
+    INCLUDE(${KWWidgets_USE_FILE})
+    ADD_DEF( USE_KWWIDGETS )
+    SET(KWWIDGETS_LIBRARIES
+      ${KWWidgets_LIBRARIES}
+     ) 
+    MARK_AS_ADVANCED(KWWidgets_DIR)
+  ELSE(KWWidgets_FOUND)
+     message(FATAL_ERROR "KWWidgets_DIR not found")
+  ENDIF(KWWidgets_FOUND)
+ENDIF(USE_KW)
+#-----------------------------------------------------------------------------
+
+
 
 #-----------------------------------------------------------------------------
 IF(USE_ITK)
@@ -35,6 +39,7 @@ IF(USE_ITK)
   FIND_PACKAGE(ITK)
   # If itk found
   IF(ITK_FOUND)
+    MESSAGE ( STATUS "=======================================")
     MESSAGE ( STATUS "Looking for ITK... found")
     MESSAGE ( STATUS "* Dir     = ${ITK_DIR}")
     MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
@@ -44,62 +49,6 @@ IF(USE_ITK)
       ITKCommon ITKIO ITKBasicFilters ITKAlgorithms
       )  
     MARK_AS_ADVANCED(ITK_DIR)
-   # images compilation option 
-    OPTION ( itk_IMAGE_DIM_2 "itk : Compile 2D images" ON)
-    OPTION ( itk_IMAGE_DIM_3 "itk : Compile 3D images" ON)
-    OPTION ( itk_IMAGE_DIM_4 "itk : Compile 4D images" ON)
-    OPTION ( itk_IMAGE_TYPE_CHAR "itk : Compile char images" ON)
-    OPTION ( itk_IMAGE_TYPE_UCHAR "itk : Compile unsigned char images" ON)
-    OPTION ( itk_IMAGE_TYPE_SHORT "itk : Compile short images" ON)
-    OPTION ( itk_IMAGE_TYPE_USHORT "itk : Compile unsigned short images" ON)
-    OPTION ( itk_IMAGE_TYPE_INT "itk : Compile int images" ON)
-    OPTION ( itk_IMAGE_TYPE_UINT "itk : Compile unsigned int images" ON)
-    OPTION ( itk_IMAGE_TYPE_FLOAT "itk : Compile float images" ON)
-    OPTION ( itk_IMAGE_TYPE_DOUBLE "itk : Compile double images" ON)
-    
-    IF ( itk_IMAGE_DIM_2 ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_DIM_2 )
-    ENDIF ( itk_IMAGE_DIM_2 )
-    
-    IF ( itk_IMAGE_DIM_3 ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_DIM_3 )
-    ENDIF ( itk_IMAGE_DIM_3 )
-    
-    IF ( itk_IMAGE_DIM_4 ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_DIM_4 )
-    ENDIF ( itk_IMAGE_DIM_4 )
-
-    IF ( itk_IMAGE_TYPE_CHAR ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_int8_t )
-    ENDIF ( itk_IMAGE_TYPE_CHAR )
-
-    IF ( itk_IMAGE_TYPE_UCHAR ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_uint8_t )
-    ENDIF ( itk_IMAGE_TYPE_UCHAR )
-    
-    IF ( itk_IMAGE_TYPE_SHORT ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_int16_t )
-    ENDIF ( itk_IMAGE_TYPE_SHORT )
-    
-    IF ( itk_IMAGE_TYPE_USHORT ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_uint16_t )
-    ENDIF ( itk_IMAGE_TYPE_USHORT )
-    
-    IF ( itk_IMAGE_TYPE_INT ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_int32_t )
-    ENDIF ( itk_IMAGE_TYPE_INT )
-    
-    IF ( itk_IMAGE_TYPE_UINT ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_uint32_t )
-    ENDIF ( itk_IMAGE_TYPE_UINT )
-    
-    IF ( itk_IMAGE_TYPE_FLOAT ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_float )
-    ENDIF ( itk_IMAGE_TYPE_FLOAT )
-    
-    IF ( itk_IMAGE_TYPE_DOUBLE ) 
-      CREA_DEFINE( BBTK_ITK_IMAGE_TYPE_double )
-    ENDIF ( itk_IMAGE_TYPE_DOUBLE )
   ELSE(ITK_FOUND)
      message(FATAL_ERROR "ITK_DIR not found")
   ENDIF(ITK_FOUND)
@@ -116,6 +65,7 @@ IF(USE_GDCM)
     INCLUDE(${GDCM_USE_FILE})
     CREA_DEFINE( USE_GDCM )
 
+    MESSAGE ( STATUS "=======================================")
     MESSAGE ( STATUS "Looking for GDCM... found")
     MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
     MESSAGE ( STATUS "* Version   = ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
@@ -165,6 +115,7 @@ IF(USE_GDCM2)
     CREA_DEFINE( USE_GDCM2 )
     CREA_DEFINE_WITH_VAL( GDCM_NAME_SPACE gdcm )
 
+    MESSAGE ( STATUS "=======================================")
     MESSAGE ( STATUS "Looking for GDCM2... found")
     MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
     MESSAGE ( STATUS "* Version   = ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
@@ -201,7 +152,7 @@ ENDIF(USE_GDCM2)
 
 #-----------------------------------------------------------------------------
 IF(USE_WXWIDGETS)
-  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_wxWidgets.cmake)
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
   CREA_FIND_WXWIDGETS()
   CREA_USE_WXWIDGETS()
 ENDIF(USE_WXWIDGETS)
@@ -211,6 +162,7 @@ ENDIF(USE_WXWIDGETS)
 
 #-----------------------------------------------------------------------------
 IF(USE_DOXYGEN) 
+  MESSAGE ( STATUS "=======================================")
   FIND_PACKAGE(Doxygen REQUIRED)
 #  MESSAGE(STATUS "Looking for doxygen... - found ${DOXYGEN}")
   #  IF(DOXYGEN)
@@ -225,6 +177,7 @@ ENDIF(USE_DOXYGEN)
 #-----------------------------------------------------------------------------
 IF(USE_LATEX) 
   FIND_PACKAGE(LATEX REQUIRED)
+  MESSAGE ( STATUS "=======================================")
   MESSAGE(STATUS "Looking for latex... - found ${LATEX_COMPILER}")
 ENDIF(USE_LATEX) 
 #-----------------------------------------------------------------------------
@@ -235,7 +188,8 @@ IF(USE_TTH)
   IF (NOT LATEX_tth_CONVERTER)
     MESSAGE(FATAL_ERROR "TTH not found (LATEX_tth_CONVERTER). Required to build the HTML documentation from tex source")
   ELSE (NOT LATEX_tth_CONVERTER)
-    MESSAGE(STATUS "Looking for tth... - found ${LATEX_tth_CONVERTER}")
+    MESSAGE ( STATUS "=======================================")
+    MESSAGE ( STATUS "Looking for tth... - found ${LATEX_tth_CONVERTER}")
   ENDIF(NOT LATEX_tth_CONVERTER)
   MARK_AS_ADVANCED(LATEX_tth_CONVERTER)
 ENDIF(USE_TTH)
@@ -245,7 +199,8 @@ ENDIF(USE_TTH)
 IF(USE_BOOST)
   FIND_PACKAGE(Boost REQUIRED)
   IF(Boost_FOUND)
-    MESSAGE(STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
+    MESSAGE ( STATUS "=======================================")
+    MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
     INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
     LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
     CREA_DEFINE( USE_BOOST )

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
new file mode 100644 (file)
index 0000000..a15d0f5
--- /dev/null
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -0,0 +1,35 @@
+MACRO(CREA_FIND_AND_USE_VTK)
+  #---------------------------------------------------------------------------
+  IF(NOT VTK_FOUND)
+    # Search VTK
+    FIND_PACKAGE(VTK)
+    # If vtk found
+    IF(VTK_FOUND)
+      MESSAGE ( STATUS "=======================================")
+      MESSAGE ( STATUS "Looking for VTK... found")
+      MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
+      MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
+      INCLUDE(${VTK_USE_FILE})
+      CREA_DEFINE( USE_VTK )
+      SET(VTK_LIBRARIES
+       vtkCommon     # Mandatory
+       vtkFiltering  # vtkImageData
+       vtkRendering  # vtkProp3D
+       vtkWidgets    # vtkImagePlaneWidget
+       vtkIO         # vtkMetaImageReader/Writer
+       vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
+       vtkGraphics   # vtkContourFilter, sources
+       vtkVolumeRendering # Mappers 
+       #      vtkGenericFiltering
+       # LG : removed vtkIO because conflict with itktiff lib in ITKIO  ??
+       ) 
+      IF(NOT USE_ITK)
+       SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
+      ENDIF(NOT USE_ITK)
+      MARK_AS_ADVANCED(VTK_DIR)
+    ELSE(VTK_FOUND)
+      message(FATAL_ERROR "VTK_DIR not found")
+    ENDIF(VTK_FOUND)
+  ENDIF(NOT VTK_FOUND)  
+  #---------------------------------------------------------------------------
+ENDMACRO(CREA_FIND_AND_USE_VTK)

diff --git a/cmake/CREAMacro_wxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
similarity index 84%
rename from cmake/CREAMacro_wxWidgets.cmake
rename to cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 56bde2df4f2c82413765d96b0fdac277dec0aa2a..cec6770218da39a9d9d6ce0db53b90ccf24f8d4d 100644 (file)
--- a/cmake/CREAMacro_wxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -27,6 +27,7 @@ MACRO(CREA_FIND_WXWIDGETS)
     #
   
   ELSE(WIN32)
+    IF(NOT wxWidgets_FOUND)
     # CMake 2.6:
     # technically those packages are not required 
     # since one can still use the Motif/X11 version and not the gtk one:
@@ -43,8 +44,10 @@ MACRO(CREA_FIND_WXWIDGETS)
       ${WXGLCANVASLIBS})
     #
     IF(wxWidgets_FOUND)
-      MESSAGE(STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
+      MESSAGE ( STATUS "=======================================")
+      MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
     ENDIF(wxWidgets_FOUND)
+    ENDIF(NOT wxWidgets_FOUND)
   ENDIF(WIN32)
   
 
@@ -56,6 +59,7 @@ ENDMACRO(CREA_FIND_WXWIDGETS)
 MACRO(CREA_USE_WXWIDGETS)
   # Preprocessor settings
   CREA_DEFINE( USE_WXWIDGETS )
+  CREA_DEFINE( _USE_WXWIDGETS_ )
   #
   IF(WIN32)
     # Clean ?
@@ -93,3 +97,10 @@ MACRO(CREA_USE_WXWIDGETS)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
 #=======================================================================
+
+#=======================================================================
+MACRO(CREA_FIND_AND_USE_WXWIDGETS)
+  CREA_FIND_WXWIDGETS()
+  CREA_USE_WXWIDGETS()
+ENDMACRO(CREA_FIND_AND_USE_WXWIDGETS)
+#=======================================================================

diff --git a/cmake/CREAMacros.cmake b/cmake/CREAMacros.cmake
index 0a11ab114ffdacd29c6a5a46e32350c71c139117..41d37c1528303421ce083fc50cf47074a791231f 100644 (file)
--- a/cmake/CREAMacros.cmake
+++ b/cmake/CREAMacros.cmake
@@ -11,7 +11,7 @@ INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_InstallLibraryForCMake.cmake )
 #========================================================================
 
 #========================================================================
-INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_ManageSharedLibrary.cmake )
+INCLUDE( ${CREA_CMAKE_DIR}/CREAMacro_DynamicLibraryExport.cmake )
 #========================================================================
 
 #========================================================================

diff --git a/cmake/CREAResolveOptions.cmake b/cmake/CREAResolveOptions.cmake
index 6f00cf596cc642b2637e6355316c73a7e86b0673..fc6943546b62243836b22d2066b01a530172e857 100644 (file)
--- a/cmake/CREAResolveOptions.cmake
+++ b/cmake/CREAResolveOptions.cmake
@@ -1,3 +1,5 @@
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "Resolving crea compilation options")
 # messages compilation options 
 IF (CREA_COMPILE_MESSAGES) 
   CREA_DEFINE( CREA_COMPILE_MESSAGES )
@@ -14,3 +16,4 @@ ENDIF (CREA_COMPILE_WARNING_MESSAGES)
 IF (CREA_COMPILE_ERROR_MESSAGES) 
   CREA_DEFINE( CREA_COMPILE_ERROR_MESSAGES )
 ENDIF (CREA_COMPILE_ERROR_MESSAGES) 
+MESSAGE(STATUS "=======================================")

diff --git a/cmake/InstallLibraryForCMake_LibraryConfig.cmake.in b/cmake/InstallLibraryForCMake_LibraryConfig.cmake.in
index fb641d2e56cbb238bfbade359e55e9f66f2623cc..e82e055c86d2372e6e5d31674f77379f8716dc31 100644 (file)
--- a/cmake/InstallLibraryForCMake_LibraryConfig.cmake.in
+++ b/cmake/InstallLibraryForCMake_LibraryConfig.cmake.in
@@ -104,7 +104,8 @@ SET(@LIBRARY_NAME@_LIBRARIES @CILC_LIB_LIBRARIES@)
 
 # Messages
 IF(CREA_VERBOSE_CMAKE)
-  MESSAGE(STATUS "Looking for @LIBRARY_NAME@... found - configuration :")
+  MESSAGE(STATUS "=======================================")
+  MESSAGE(STATUS "Looking for @LIBRARY_NAME@... found:")
   MESSAGE(STATUS "* @LIBRARY_NAME@_DIR          = ${@LIBRARY_NAME@_DIR}")
   MESSAGE(STATUS "* @LIBRARY_NAME@_VERSION      = ${@LIBRARY_NAME@_VERSION}")
   MESSAGE(STATUS "* @LIBRARY_NAME@_USE_FILE     = ${@LIBRARY_NAME@_USE_FILE}")

diff --git a/cmake/LIBRARY_NAME_EXPORT.h.in b/cmake/LIBRARY_NAME_EXPORT.h.in
new file mode 100644 (file)
index 0000000..038f1ec
--- /dev/null
+++ b/cmake/LIBRARY_NAME_EXPORT.h.in
@@ -0,0 +1,23 @@
+#ifndef __@LIBRARY_NAME@DLLImportExport_h_INCLUDED__
+#define __@LIBRARY_NAME@DLLImportExport_h_INCLUDED__
+
+// Automatically generated file which defines 
+// the symbols @LIBRARY_NAME@_EXPORT and @LIBRARY_NAME@_CDECL
+// to be used for the definition of classes or functions
+// which must be exported when the lib is built as a shared lib on Windows
+// and imported when the shared lib is used by another program
+
+#if defined(_WIN32) && defined (@LIBRARY_NAME@_BUILD_SHARED)
+  #ifdef @LIBRARY_NAME@_EXPORT_SYMBOLS
+    #define @LIBRARY_NAME@_EXPORT __declspec( dllexport )
+#else
+    #define @LIBRARY_NAME@_EXPORT __declspec( dllimport )
+  #endif
+  #define @LIBRARY_NAME@_CDECL __cdecl
+#else
+  #define @LIBRARY_NAME@_EXPORT
+  #define @LIBRARY_NAME@_CDECL
+#endif // defined(_WIN32)
+
+#endif
+

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c39fd66afa51c7918dfc6f125a00bb56bf052ea1..0df3e2c7a513ca83cd5258a8520ca6f13bbcb9d9 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+
+MESSAGE(STATUS "===============================================")
+MESSAGE(STATUS "Configuring crea library")
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 #-----------------------------------------------------------------------------
@@ -70,3 +73,4 @@ INSTALL(
   TARGETS crea
   DESTINATION ${CREA_LIB_PATH})
 #----------------------------------------------------------------------------
+MESSAGE(STATUS "===============================================")

diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
index e8206e72bba407492f56342049e375c6858b5358..c30580ce5acb0dde595e26f0728a6d78f724af00 100644 (file)
--- a/src/creawxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/15 11:19:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/12/11 14:27:00 $
+  Version:   $Revision: 1.2 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -15,6 +15,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
 
 #include "creawxVTKRenderWindowInteractor.h"
 
@@ -740,3 +742,5 @@ const char * creawxVTKRenderWindowInteractor::GetClassName() const
 // LG : EO namespace 
 //=======================================================================
 
+#endif // USE_WX
+#endif // USE_VTK

diff --git a/src/creawxVTKRenderWindowInteractor.h b/src/creawxVTKRenderWindowInteractor.h
index ebc2030656342849c158858140e32cf9bdf3368b..e1378d6f647c21c24c9bfafebaa7a19a4c512f79 100644 (file)
--- a/src/creawxVTKRenderWindowInteractor.h
+++ b/src/creawxVTKRenderWindowInteractor.h
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: creawxVTKRenderWindowInteractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/15 11:19:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/12/11 14:27:00 $
+  Version:   $Revision: 1.2 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -37,6 +37,9 @@
 #ifndef _creawxVTKRenderWindowInteractor_h_
 #define _creawxVTKRenderWindowInteractor_h_
 
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
+
 #include <creaSystem.h>
 #include <creaWx.h>
 
@@ -188,4 +191,6 @@ class CREA_EXPORT creawxVTKRenderWindowInteractor : public wxWindow, virtual pub
 // LG : EO namespace crea
 //======================================================================
 
+#endif // USE_WX
+#endif // USE_VTK
 #endif //_creawxVTKRenderWindowInteractor_h_