X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tests%2FCMakeLists.txt;h=cb05856f1a7709329ac3940516cb502661c7c2eb;hb=cbd1fd38ff1782f4a06dc4d8133abfbaf17c929d;hp=b85b146e75a45f58379761e693dbd0cbeca1a327;hpb=8eaf0a647fec2440abf6064d78d3eab735aa90c6;p=clitk.git

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b85b146..cb05856 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,15 @@
+cmake_policy(SET CMP0005 NEW)
+#=========================================================
+#=========================================================
+# Data tests path
+FIND_PATH(CLITK_TEST_DATA_PATH Lung3D.mhd)
+IF(NOT ${CLITK_TEST_DATA_PATH} MATCHES "NOTFOUND$")
+ SET(CLITK_TEST_DATA_PATH "${CLITK_TEST_DATA_PATH}/")
+ENDIF()
+ADD_DEFINITIONS(-DCLITK_TEST_DATA_PATH="${CLITK_TEST_DATA_PATH}")
+#=========================================================
+#=========================================================
+# Google test macro
 macro(ADD_GOOGLE_TESTS executable)
   foreach ( source ${ARGN} )
     file(READ "${source}" contents)
@@ -8,30 +20,35 @@ macro(ADD_GOOGLE_TESTS executable)
     endforeach(hit)
   endforeach()
 endmacro()
+#=========================================================
+#=========================================================
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests/bin)
 SET(BUILDNAME ${CMAKE_SYSTEM_NAME}${CMAKE_OSX_ARCHITECTURES} CACHE INTERNAL DOCSTRING)
-SET(CLITK_DATA_PATH ${PROJECT_BINARY_DIR}/tests/data/ CACHE STRING "dataTest path")
-#todo  test if data test path exists
-
-ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}\")
-
-add_library(gtest UNKNOWN IMPORTED)
-set(GTEST_DIR ${ITK_DIR}/../gtest/ CACHE STRING "gtestDir")
-#if windows gtestLibName=gtest.dll else libgtest.a
-set(gtestLibName libgtest.a)
-set(GTEST_LIB ${GTEST_DIR}/build/${gtestLibName})
-#message(gtestlib name = ${GTEST_LIB})
-set_property(TARGET gtest PROPERTY IMPORTED_LOCATION "${GTEST_LIB}")
-include_directories(${GTEST_DIR}/include/)
+#=========================================================
+#=========================================================
+# GoogleTest framemwork
+FIND_PATH(GTEST_DIR gtest)
+INCLUDE_DIRECTORIES(${GTEST_DIR}/include/)
 
+FIND_LIBRARY(GTEST_LIB NAMES gtest PATHS ${GTEST_DIR}/build/)
+ADD_LIBRARY(gtest UNKNOWN IMPORTED)
+SET_PROPERTY(TARGET gtest PROPERTY IMPORTED_LOCATION "${GTEST_LIB}")
+#=========================================================
+#=========================================================
+# Enabled options to test
 IF(CLITK_BUILD_TOOLS)
   ADD_SUBDIRECTORY(tools)
 ENDIF()
 IF(CLITK_BUILD_VV)
   ADD_SUBDIRECTORY(vv)
 ENDIF()
+# IF(CLITK_BUILD_SEGMENTATION)
 #   ADD_SUBDIRECTORY(segmentation)
+# ENDIF()
+# 
+# IF(CLITK_BUILD_REGISTATION)
 #   ADD_SUBDIRECTORY(registration)
-#   ADD_SUBDIRECTORY(common)
-
+# ENDIF()
+#ADD_SUBDIRECTORY(common)
+#=========================================================