X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tests%2FCMakeLists.txt;h=d4deb7594831725a861d7912cf5dd76188bfda01;hb=9516d5226b4dba29c89091ede113533ac19bced9;hp=0b0ad3eac8c729c40cd519761c52cbbf092d7397;hpb=9c2eac98fa5e9a48f3566aeb4e07d5052ee3cf89;p=clitk.git

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0b0ad3e..d4deb75 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -13,17 +13,18 @@ macro(ADD_GOOGLE_TESTS executable)
 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")
+SET(CLITK_DATA_PATH ${PROJECT_SOURCE_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)
+if(WIN32)
+  SET(gtestLibName gtest.lib)
+else(UNIX)
+  SET(gtestLibName libgtest.a)
+endif(WIN32)
 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/)
 
@@ -33,8 +34,13 @@ 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)