From 250b25154cfe5b81d5979138e3d6070de8f0da0f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Feb 2015 13:41:37 -0800 Subject: [PATCH] test for recursive dll dir search --- cmake/scripts/FixupBundlePostBuild.cmake | 2 +- interface/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/scripts/FixupBundlePostBuild.cmake b/cmake/scripts/FixupBundlePostBuild.cmake index 7a74089bfa..e41d5cbc45 100644 --- a/cmake/scripts/FixupBundlePostBuild.cmake +++ b/cmake/scripts/FixupBundlePostBuild.cmake @@ -10,4 +10,4 @@ # include(BundleUtilities) -fixup_bundle("${BUNDLE_EXECUTABLE}" "" "") \ No newline at end of file +fixup_bundle("${BUNDLE_EXECUTABLE}" "" "${LIB_SEARCH_DIRS}") \ No newline at end of file diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 459a47a1ce..746f08e0d6 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -240,11 +240,15 @@ else (APPLE) endif (APPLE) if (WIN32) + list(APPEND LIB_SEARCH_DIRS ${EXTERNALS_BINARY_DIR}) # add a post-build command to copy DLLs beside the interface executable add_custom_command( TARGET ${TARGET_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -DBUNDLE_EXECUTABLE=$ -P ${HIFI_CMAKE_DIR}/scripts/FixupBundlePostBuild.cmake + COMMAND ${CMAKE_COMMAND} + -DBUNDLE_EXECUTABLE=$ + -DLIB_SEARCH_DIRS=${LIB_SEARCH_DIRS} + -P ${HIFI_CMAKE_DIR}/scripts/FixupBundlePostBuild.cmake ) endif ()