From 8be707f63f62482158abaa5864d36f2334e4c61a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 23 Feb 2015 13:24:17 -0800 Subject: [PATCH] rename add paths macro for fixup_bundle --- CMakeLists.txt | 2 +- cmake/macros/AddPathsToLibPaths.cmake | 22 ------------------- cmake/modules/FindGLEW.cmake | 2 +- cmake/modules/FindLeapMotion.cmake | 2 +- cmake/modules/FindOpenSSL.cmake | 2 +- cmake/modules/FindQxmpp.cmake | 2 +- cmake/modules/FindSDL2.cmake | 2 +- cmake/modules/FindSixense.cmake | 2 +- cmake/modules/FindSoxr.cmake | 2 +- cmake/modules/FindTBB.cmake | 2 +- cmake/templates/FixupBundlePostBuild.cmake.in | 4 ++-- 11 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 cmake/macros/AddPathsToLibPaths.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 25c18fc058..f036a9c91f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ option(GET_SDL2 "Get SDL2 library automatically as external project" 0) option(GET_QXMPP "GET Qxmpp library automatically as external project" 0) if (WIN32) - add_paths_to_lib_paths("${QT_DIR}/bin") + add_paths_to_fixup_libs("${QT_DIR}/bin") endif () # add subdirectories for all targets diff --git a/cmake/macros/AddPathsToLibPaths.cmake b/cmake/macros/AddPathsToLibPaths.cmake deleted file mode 100644 index 7ac31db83f..0000000000 --- a/cmake/macros/AddPathsToLibPaths.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# -# AddPathsToLibPaths.cmake -# cmake/macros -# -# Copyright 2015 High Fidelity, Inc. -# Created by Stephen Birarda on February 17, 2014 -# -# Distributed under the Apache License, Version 2.0. -# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -# - -macro(ADD_PATHS_TO_LIB_PATHS) - foreach(_PATH ${ARGN}) - set(_TEMP_LIB_PATHS ${LIB_PATHS}) - - list(APPEND _TEMP_LIB_PATHS ${_PATH}) - - list(REMOVE_DUPLICATES _TEMP_LIB_PATHS) - - set(LIB_PATHS ${_TEMP_LIB_PATHS} CACHE STRING "Paths for external libraries passed to fixup_bundle" FORCE) - endforeach() -endmacro() \ No newline at end of file diff --git a/cmake/modules/FindGLEW.cmake b/cmake/modules/FindGLEW.cmake index 7abbe135cb..e86db3fdac 100644 --- a/cmake/modules/FindGLEW.cmake +++ b/cmake/modules/FindGLEW.cmake @@ -37,6 +37,6 @@ if (WIN32) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES GLEW_DLL_PATH) - add_paths_to_lib_paths(${GLEW_DLL_PATH}) + add_paths_to_fixup_libs(${GLEW_DLL_PATH}) endif () diff --git a/cmake/modules/FindLeapMotion.cmake b/cmake/modules/FindLeapMotion.cmake index 6f177cd3d7..eafb031a07 100644 --- a/cmake/modules/FindLeapMotion.cmake +++ b/cmake/modules/FindLeapMotion.cmake @@ -40,7 +40,7 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LeapMotion DEFAULT_MSG ${LEAPMOTION_REQUIREMENTS}) if (WIN32) - add_paths_to_lib_paths(${LEAPMOTION_DLL_PATH}) + add_paths_to_fixup_libs(${LEAPMOTION_DLL_PATH}) endif () mark_as_advanced(LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES LEAPMOTION_SEARCH_DIRS) diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake index 1d749a910c..db3b2ba477 100644 --- a/cmake/modules/FindOpenSSL.cmake +++ b/cmake/modules/FindOpenSSL.cmake @@ -242,7 +242,7 @@ else () endif () if (WIN32) - add_paths_to_lib_paths(${OPENSSL_DLL_PATH}) + add_paths_to_fixup_libs(${OPENSSL_DLL_PATH}) endif () mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS) diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake index 489936688e..5caa929427 100644 --- a/cmake/modules/FindQxmpp.cmake +++ b/cmake/modules/FindQxmpp.cmake @@ -41,5 +41,5 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_LIBRARY) if (QXMPP_DLL_PATH) - add_paths_to_lib_paths(${QXMPP_DLL_PATH}) + add_paths_to_fixup_libs(${QXMPP_DLL_PATH}) endif () \ No newline at end of file diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index 8c7c0c581b..1a089bcb60 100644 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -220,5 +220,5 @@ endif () FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS}) if (WIN32) - add_paths_to_lib_paths(${SDL2_DLL_PATH}) + add_paths_to_fixup_libs(${SDL2_DLL_PATH}) endif () diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index f47cfa65ad..0f4346c53d 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -52,7 +52,7 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Sixense DEFAULT_MSG ${SIXENSE_REQUIREMENTS}) if (WIN32) - add_paths_to_lib_paths(${SIXENSE_DEBUG_DLL_PATH} ${SIXENSE_RELEASE_DLL_PATH} ${SIXENSE_DEVICE_DLL_PATH}) + add_paths_to_fixup_libs(${SIXENSE_DEBUG_DLL_PATH} ${SIXENSE_RELEASE_DLL_PATH} ${SIXENSE_DEVICE_DLL_PATH}) endif () mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS SIXENSE_SEARCH_DIRS) diff --git a/cmake/modules/FindSoxr.cmake b/cmake/modules/FindSoxr.cmake index 1c67650496..df6ad8050e 100644 --- a/cmake/modules/FindSoxr.cmake +++ b/cmake/modules/FindSoxr.cmake @@ -37,7 +37,7 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Soxr DEFAULT_MSG ${SOXR_REQUIREMENTS}) if (WIN32) - add_paths_to_lib_paths(${SOXR_DLL_PATH}) + add_paths_to_fixup_libs(${SOXR_DLL_PATH}) endif () mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS) \ No newline at end of file diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index 9781154c1a..4d4b3ca504 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -88,7 +88,7 @@ endif () find_package_handle_standard_args(TBB DEFAULT_MSG ${TBB_REQUIREMENTS}) if (WIN32) - add_paths_to_lib_paths(${TBB_DLL_PATH}) + add_paths_to_fixup_libs(${TBB_DLL_PATH}) endif () set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY}) diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in index f72ba577b9..7d98e9796c 100644 --- a/cmake/templates/FixupBundlePostBuild.cmake.in +++ b/cmake/templates/FixupBundlePostBuild.cmake.in @@ -10,5 +10,5 @@ # include(BundleUtilities) -message(STATUS "LIB_PATHS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @LIB_PATHS@") -fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@LIB_PATHS@") \ No newline at end of file +message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@") +fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@FIXUP_LIBS@") \ No newline at end of file