Fix warnings, add a GDCM_DATA_ROOT to CMake

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4433fd5f6c2732a7cddf18f4281ebedb8f4d5143..0ada9b14e5bdbc8fe418706252dd63295e9387c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,24 @@ SUBDIRS(
   Test\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# Adding GDCM_DATA_ROOT\r
+FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr\r
+       ${GDCM_SOURCE_DIR}/../gdcmData \r
+       $ENV{GDCM_DATA}\r
+       $ENV{PUB_DICT_PATH}/../../gdcmData\r
+)\r
+\r
+#-----------------------------------------------------------------------------\r
+# Add the testing directories\r
+OPTION(GDCM_BUILD_TESTING "Test the project" ON)\r
+IF(GDCM_BUILD_TESTING)\r
+  ENABLE_TESTING()\r
+  INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)\r
+  SUBDIRS(Test)\r
+ENDIF(GDCM_BUILD_TESTING)\r
+\r
+\r
 #-----------------------------------------------------------------------------\r
 OPTION(GDCM_VTK "Build VTK-GDCM Lib." OFF)\r
 IF(GDCM_VTK)\r
@@ -116,7 +134,7 @@ EXPORT_LIBRARY_DEPENDENCIES(
   ${GDCM_BINARY_DIR}/gdcmLibraryDepends.cmake\r
   )\r
 \r
-# Intall the âckaging files for use by FIND_PACKAGE(GDCM) in user projects.\r
+# Intall the packaging files for use by FIND_PACKAGE(GDCM) in user projects.\r
 INSTALL_FILES(/lin/gdcm FILES\r
   ${GDCM_SOURCE_DIR}/gdcmUse.cmake\r
   ${GDCM_BINARY_DIR}/gdcmConfig.cmake\r