Merge pull request SimpleITK#1194 from blowekamp/FixExternalDataPath

Fix external data path
blowekamp · Sep 14, 2020 · ded1bc3 · ded1bc3
2 parents 85f2ce9 + 2835481
commit ded1bc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMake/sitkExternalData.cmake b/CMake/sitkExternalData.cmake
@@ -17,10 +17,12 @@ if(NOT ExternalData_OBJECT_STORES)
   set(ExternalData_OBJECT_STORES "${CMAKE_BINARY_DIR}/ExternalData/Objects")
   file(MAKE_DIRECTORY "${ExternalData_OBJECT_STORES}")
 endif()
-list(APPEND ExternalData_OBJECT_STORES
-  # Local data store populated by the ITK pre-commit hook
-  "${SimpleITK_SOURCE_DIR}/.ExternalData"
-  )
+if (DEFINED SimpleITK_SOURCE_DIR AND EXISTS "${SimpleITK_SOURCE_DIR}/.ExternalData")
+  # Add source directory path
+  list(APPEND ExternalData_OBJECT_STORES
+          "${SimpleITK_SOURCE_DIR}/.ExternalData"
+    )
+endif()
 
 set(ExternalData_BINARY_ROOT ${CMAKE_BINARY_DIR}/ExternalData)
 

diff --git a/CMake/sitkLanguageOptions.cmake b/CMake/sitkLanguageOptions.cmake
@@ -26,7 +26,7 @@ mark_as_advanced(WRAP_DEFAULT)
 # Modified Variables:
 #  - _do_find_package - always defined, true if find_pacakge for
 #    languages should be run.
-#  - _find_package_extra_args - may be set to `REQUIRED` of `QUIET` as
+#  - _find_package_extra_args - may be set to `REQUIRED` or `QUIET` as
 #    needed.
 #  - WRAP_<languageName>_DEFAULT - may be set to `ON` or `OFF` if it
 #    can be determined with out a find_package call