Skip to content

Commit

Permalink
Revert fletch_DIR to fletch_ROOT
Browse files Browse the repository at this point in the history
fletch_ROOT has been returned to fletchConfig.cmake
  • Loading branch information
mleotta committed Jul 17, 2017
1 parent 0dfed48 commit 0b8ab02
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 0b8ab02

Please sign in to comment.