Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add fixup_bundle step for WIN32 interface

Browse source
This commit is contained in:
Stephen Birarda 2015-02-17 13:17:23 -08:00
parent 016ef2b243
commit bc899eaa58
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -103,8 +103,9 @@ set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
# setup for find modules # setup for find modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros") set(HIFI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(EXTERNAL_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals") set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros")
set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals")
set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals") set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-externals")
if (ANDROID) if (ANDROID)

2
cmake/macros/AddDependencyExternalProjects.cmake
View file

@ -1,5 +1,5 @@
# #
# SetupExternalProject.cmake # AddDependencyExternalProjects.cmake
# cmake/macros # cmake/macros
# #
# Copyright 2015 High Fidelity, Inc. # Copyright 2015 High Fidelity, Inc.

13
cmake/scripts/FixupBundlePostBuild.cmake Normal file
View file

@ -0,0 +1,13 @@
#
# FixupBundlePostBuild.cmake.in
# cmake/templates
#
# Copyright 2015 High Fidelity, Inc.
# Created by Stephen Birarda on February 13, 2014
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
include(BundleUtilities)
fixup_bundle("${BUNDLE_EXECUTABLE}" "" "")

9
interface/CMakeLists.txt
View file

@ -239,5 +239,14 @@ else (APPLE)
endif() endif()
endif (APPLE) endif (APPLE)
if (WIN32)
# 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=$<TARGET_FILE:${TARGET_NAME}> -P ${HIFI_CMAKE_DIR}/scripts/FixupBundlePostBuild.cmake
)
endif ()
# link any dependencies bubbled up from our linked dependencies # link any dependencies bubbled up from our linked dependencies
include_dependency_includes() include_dependency_includes()