Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 18:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename add paths macro for fixup_bundle

Browse source
This commit is contained in:
Stephen Birarda 2015-02-23 13:24:17 -08:00
parent bae5d987f9
commit 8be707f63f
11 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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) option(GET_QXMPP "GET Qxmpp library automatically as external project" 0)
if (WIN32) if (WIN32)
add_paths_to_lib_paths("${QT_DIR}/bin") add_paths_to_fixup_libs("${QT_DIR}/bin")
endif () endif ()
# add subdirectories for all targets # add subdirectories for all targets

22
cmake/macros/AddPathsToLibPaths.cmake
View file

@ -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()

2
cmake/modules/FindGLEW.cmake
View file

@ -37,6 +37,6 @@ if (WIN32)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES GLEW_DLL_PATH) 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 () endif ()

2
cmake/modules/FindLeapMotion.cmake
View file

@ -40,7 +40,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LeapMotion DEFAULT_MSG ${LEAPMOTION_REQUIREMENTS}) find_package_handle_standard_args(LeapMotion DEFAULT_MSG ${LEAPMOTION_REQUIREMENTS})
if (WIN32) if (WIN32)
add_paths_to_lib_paths(${LEAPMOTION_DLL_PATH}) add_paths_to_fixup_libs(${LEAPMOTION_DLL_PATH})
endif () endif ()
mark_as_advanced(LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES LEAPMOTION_SEARCH_DIRS) mark_as_advanced(LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES LEAPMOTION_SEARCH_DIRS)

2
cmake/modules/FindOpenSSL.cmake
View file

@ -242,7 +242,7 @@ else ()
endif () endif ()
if (WIN32) if (WIN32)
add_paths_to_lib_paths(${OPENSSL_DLL_PATH}) add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
endif () endif ()
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS) mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)

2
cmake/modules/FindQxmpp.cmake
View file

@ -41,5 +41,5 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_LIBRARY) find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_LIBRARY)
if (QXMPP_DLL_PATH) if (QXMPP_DLL_PATH)
add_paths_to_lib_paths(${QXMPP_DLL_PATH}) add_paths_to_fixup_libs(${QXMPP_DLL_PATH})
endif () endif ()

2
cmake/modules/FindSDL2.cmake
View file

@ -220,5 +220,5 @@ endif ()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS})
if (WIN32) if (WIN32)
add_paths_to_lib_paths(${SDL2_DLL_PATH}) add_paths_to_fixup_libs(${SDL2_DLL_PATH})
endif () endif ()

2
cmake/modules/FindSixense.cmake
View file

@ -52,7 +52,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Sixense DEFAULT_MSG ${SIXENSE_REQUIREMENTS}) find_package_handle_standard_args(Sixense DEFAULT_MSG ${SIXENSE_REQUIREMENTS})
if (WIN32) 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 () endif ()
mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS SIXENSE_SEARCH_DIRS) mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS SIXENSE_SEARCH_DIRS)

2
cmake/modules/FindSoxr.cmake
View file

@ -37,7 +37,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Soxr DEFAULT_MSG ${SOXR_REQUIREMENTS}) find_package_handle_standard_args(Soxr DEFAULT_MSG ${SOXR_REQUIREMENTS})
if (WIN32) if (WIN32)
add_paths_to_lib_paths(${SOXR_DLL_PATH}) add_paths_to_fixup_libs(${SOXR_DLL_PATH})
endif () endif ()
mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS) mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS)

2
cmake/modules/FindTBB.cmake
View file

@ -88,7 +88,7 @@ endif ()
find_package_handle_standard_args(TBB DEFAULT_MSG ${TBB_REQUIREMENTS}) find_package_handle_standard_args(TBB DEFAULT_MSG ${TBB_REQUIREMENTS})
if (WIN32) if (WIN32)
add_paths_to_lib_paths(${TBB_DLL_PATH}) add_paths_to_fixup_libs(${TBB_DLL_PATH})
endif () endif ()
set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY}) set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY})

4
cmake/templates/FixupBundlePostBuild.cmake.in
View file

@ -10,5 +10,5 @@
# #
include(BundleUtilities) include(BundleUtilities)
message(STATUS "LIB_PATHS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @LIB_PATHS@") message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@LIB_PATHS@") fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@FIXUP_LIBS@")