Merge pull request #253 from mleotta/dev/revert-to-fletch_ROOT

Revert fletch_DIR to fletch_ROOT
Kitware · Jul 18, 2017 · 8c11789 · 8c11789
2 parents 0dfed48 + 0b8ab02
commit 8c11789
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -249,14 +249,14 @@ if (MAPTK_FIXUP_BUNDLE_ON_PACKAGE)
   list(APPEND FIXUP_DIRS "${qtExtensions_DIR}/${BINARY_DIR}")
 
   list(APPEND FIXUP_DIRS "${KWIVER_LIBRARY_DIR}/${BINARY_DIR}")
-  if(DEFINED fletch_DIR)
+  if(DEFINED fletch_ROOT)
     if(WIN32)
-      list(APPEND FIXUP_DIRS "${fletch_DIR}/bin")
+      list(APPEND FIXUP_DIRS "${fletch_ROOT}/bin")
       # this is a hack for now.  Fletch should really export paths like this.
-      list(APPEND FIXUP_DIRS "${fletch_DIR}/x64/vc14/bin")
-      list(APPEND FIXUP_DIRS "${fletch_DIR}/x64/vc15/bin")
+      list(APPEND FIXUP_DIRS "${fletch_ROOT}/x64/vc14/bin")
+      list(APPEND FIXUP_DIRS "${fletch_ROOT}/x64/vc15/bin")
     else()
-      list(APPEND FIXUP_DIRS "${fletch_DIR}/lib")
+      list(APPEND FIXUP_DIRS "${fletch_ROOT}/lib")
     endif()
   endif()