Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:13:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add ssleay copy for win AC/DS/Interface

Browse source
This commit is contained in:
Stephen Birarda 2016-01-15 10:33:53 -08:00
parent 3e3831dbdd
commit c1a9a7f4c1
4 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/CMakeLists.txt
View file

@ -9,5 +9,7 @@ link_hifi_libraries(
controllers physics controllers physics
) )
set(MANUAL_SSLEAY_COPY TRUE)
package_libraries_for_deployment() package_libraries_for_deployment()
install_beside_console() install_beside_console()

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

@ -1,56 +1,59 @@
# #
# FixupBundlePostBuild.cmake.in # FixupBundlePostBuild.cmake.in
# cmake/templates # cmake/templates
# #
# Copyright 2015 High Fidelity, Inc. # Copyright 2015 High Fidelity, Inc.
# Created by Stephen Birarda on February 13, 2014 # Created by Stephen Birarda on February 13, 2014
# #
# Distributed under the Apache License, Version 2.0. # Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
# #
include(BundleUtilities) include(BundleUtilities)
# replace copy_resolved_item_into_bundle
# replace copy_resolved_item_into_bundle
# #
# The official version of copy_resolved_item_into_bundle will print out a "warning:" when # The official version of copy_resolved_item_into_bundle will print out a "warning:" when
# the resolved item matches the resolved embedded item. This not not really an issue that # the resolved item matches the resolved embedded item. This not not really an issue that
# should rise to the level of a "warning" so we replace this message with a "status:" # should rise to the level of a "warning" so we replace this message with a "status:"
# #
function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item) function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
if(WIN32) if (WIN32)
# ignore case on Windows # ignore case on Windows
string(TOLOWER "${resolved_item}" resolved_item_compare) string(TOLOWER "${resolved_item}" resolved_item_compare)
string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare) string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
else() else()
set(resolved_item_compare "${resolved_item}") set(resolved_item_compare "${resolved_item}")
set(resolved_embedded_item_compare "${resolved_embedded_item}") set(resolved_embedded_item_compare "${resolved_embedded_item}")
endif() endif()
if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}") if ("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
# this is our only change from the original version # this is our only change from the original version
message(STATUS "status: resolved_item == resolved_embedded_item - not copying...") message(STATUS "status: resolved_item == resolved_embedded_item - not copying...")
else() else()
#message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}") #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}") execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
file(RPATH_REMOVE FILE "${resolved_embedded_item}") file(RPATH_REMOVE FILE "${resolved_embedded_item}")
endif()
endif() endif()
endif()
endfunction() endfunction()
message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@") message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
message(STATUS "Scanning for plugins from ${BUNDLE_PLUGIN_DIR}") message(STATUS "Scanning for plugins from ${BUNDLE_PLUGIN_DIR}")
if (APPLE) if (APPLE)
set(PLUGIN_EXTENSION "dylib") set(PLUGIN_EXTENSION "dylib")
elseif (WIN32) elseif (WIN32)
set(PLUGIN_EXTENSION "dll") set(PLUGIN_EXTENSION "dll")
else() else()
set(PLUGIN_EXTENSION "so") set(PLUGIN_EXTENSION "so")
endif() endif()
file(GLOB RUNTIME_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}") file(GLOB EXTRA_LIBRARIES "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
fixup_bundle("${BUNDLE_EXECUTABLE}" "${RUNTIME_PLUGINS}" "@FIXUP_LIBS@")
if (MANUAL_SSLEAY_COPY)
file(SET EXTRA_LIBRARIES ${EXTRA_LIBRARIES} "ssleay32.dll")
endif()
fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_LIBRARIES}" "@FIXUP_LIBS@")

1
domain-server/CMakeLists.txt
View file

@ -36,6 +36,7 @@ if (UNIX)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
endif (UNIX) endif (UNIX)
set(MANUAL_SSLEAY_COPY TRUE)
package_libraries_for_deployment() package_libraries_for_deployment()
install_beside_console() install_beside_console()

1
interface/CMakeLists.txt
View file

@ -265,4 +265,5 @@ if (WIN32)
set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml") set(EXTRA_DEPLOY_OPTIONS "--qmldir ${PROJECT_SOURCE_DIR}/resources/qml")
endif() endif()
set(MANUAL_SSLEAY_COPY TRUE)
package_libraries_for_deployment() package_libraries_for_deployment()