compilation of vv and tests

- vv stand-alone compilation
  + some dependencies from tools were not being compiled

- tests path
  + better path resolution

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2ca6877f13737980c2923226fc343b92b1ff5e35..1e5595b07cc56f4bea60ade0954faa05d3781c27 100755 (executable)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,11 +5,13 @@ IF (BUILD_TESTING)
 
   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests/bin)
 
-  FIND_PATH(CLITK_DATA_PATH data)
+  # default data path is searched in the project source tree
+  FIND_PATH(CLITK_DATA_PATH data PATHS ${PROJECT_SOURCE_DIR})
   IF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND")
     MESSAGE(FATAL_ERROR "Data path must be given when tests are enabled.")
   ENDIF (CLITK_DATA_PATH STREQUAL "CLITK_DATA_PATH-NOTFOUND")
 
+  set(CLITK_DATA_PATH ${CLITK_DATA_PATH}/data)
   ADD_DEFINITIONS(-DCLITK_DATA_PATH='"${CLITK_DATA_PATH}"')
 
   ADD_SUBDIRECTORY(tools)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8df0ff82744f58c54d334359a1dbacf637e9f437..c46ba3a0ec806a420f0819ad9c94bcfbc7c781e3 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -21,6 +21,9 @@ ADD_LIBRARY(clitkResampleImageLib clitkResampleImageGenericFilter.cxx ${clitkRes
 WRAP_GGO(clitkMIP_GGO_C clitkMIP.ggo)
 ADD_LIBRARY(clitkMIPLib clitkMIPGenericFilter.cxx ${clitkMIP_GGO_C})
 
+WRAP_GGO(clitkMedianImageFilter_GGO_C clitkMedianImageFilter.ggo)
+ADD_LIBRARY(clitkMedianImageFilterLib clitkMedianImageGenericFilter.cxx ${clitkMedianImageFilter_GGO_C})
+
 IF (CLITK_BUILD_TOOLS)
     WRAP_GGO(clitkDicomInfo_GGO_C clitkDicomInfo.ggo)
     ADD_EXECUTABLE(clitkDicomInfo clitkDicomInfo.cxx ${clitkDicomInfo_GGO_C})

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index e91c2bff7514dd8d74127f4ecfafa9b0fe1395c9..ccb9ef23a07bab0e56f39ad9f10c763b70d923ba 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -38,6 +38,8 @@ SET(vvToolExtractPatient_LIBS clitkSegmentationGgoLib)
 SET(vvToolExtractLung_LIBS clitkSegmentationGgoLib)
 SET(vvToolCropImage_LIBS clitkCropImageLib)
 SET(vvToolMIP_LIBS clitkMIPLib)
+SET(vvToolMedianFilter_LIBS clitkMedianImageFilterLib)
+SET(vvToolImageArithm_LIBS clitkImageArithmImageLib)
 
 #=========================================================
 # List of vv source files