From 0b8ab02477e94c43e953851f6f2142a2c9e579d4 Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Mon, 17 Jul 2017 11:45:53 -0400 Subject: [PATCH] Revert fletch_DIR to fletch_ROOT fletch_ROOT has been returned to fletchConfig.cmake --- gui/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 4b93cedf4..cb47fd525 100644 --- 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()