use of find_xxx to find googleframework and data paths

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d4deb7594831725a861d7912cf5dd76188bfda01..fcacae041d9ce5432b9f831754bdb18fe8a49951 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_policy(SET CMP0005 NEW)
-
-
+#=========================================================
+# Google test macro
 macro(ADD_GOOGLE_TESTS executable)
+message(exe : ${executable})
   foreach ( source ${ARGN} )
     file(READ "${source}" contents)
     string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
@@ -11,23 +12,27 @@ 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_SOURCE_DIR}/tests/data/ CACHE STRING "dataTest path")
-#todo  test if data test path exists
+#=========================================================
+#=========================================================
+# Data tests path
+FIND_PATH(CLITK_DATA_PATH data)
 ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}\")
+#=========================================================
+#=========================================================
+# GoogleTest framemwork
+FIND_PATH(GTEST_DIR gtest)
+INCLUDE_DIRECTORIES(${GTEST_DIR}/include/)
 
-add_library(gtest UNKNOWN IMPORTED)
-set(GTEST_DIR ${ITK_DIR}/../gtest/ CACHE STRING "gtestDir")
-if(WIN32)
-  SET(gtestLibName gtest.lib)
-else(UNIX)
-  SET(gtestLibName libgtest.a)
-endif(WIN32)
-set(GTEST_LIB ${GTEST_DIR}/build/${gtestLibName})
-set_property(TARGET gtest PROPERTY IMPORTED_LOCATION "${GTEST_LIB}")
-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()
@@ -42,5 +47,5 @@ ENDIF()
 #   ADD_SUBDIRECTORY(registration)
 # ENDIF()
 #ADD_SUBDIRECTORY(common)
-
+#=========================================================
 

diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
index ad57d590876a8ac5f1d4b6a7eeba817c35303a26..8c6c282779e0a280d5f389fdce066cdc4dda2c28 100644 (file)
--- a/tests/tools/CMakeLists.txt
+++ b/tests/tools/CMakeLists.txt
@@ -11,4 +11,5 @@ target_link_libraries(toolsTest vvLib ${vvExternalLibs} gtest)
 
 # Add all tests found in the source code, calling the executable to run them
 add_google_tests ( ${EXECUTABLE_OUTPUT_PATH}/toolsTest ${srcs})
+
 SET(BUILDNAME ${BUILDNAME}_tools CACHE INTERNAL DOCSTRING)
\ No newline at end of file

diff --git a/tests/vv/vvRegisterFormTest.cxx b/tests/vv/vvRegisterFormTest.cxx
index 836f32d131eabb78bf959edcd509620bcf6bc5ae..15d88c4fb41dd6d2cb1b488487705934ccd7f4b8 100644 (file)
--- a/tests/vv/vvRegisterFormTest.cxx
+++ b/tests/vv/vvRegisterFormTest.cxx
@@ -22,7 +22,7 @@
 #include "vvConfiguration.h"
 #include <stdio.h>
 #include <fstream>
-const std::string data_path = "/home/mpech/workspace/vvSource/tests/data/";
+const std::string data_path = CLITK_DATA_PATH;
 TEST(vvRegisterForm, canPush){
   QUrl url;
   //the file exists with some old lines