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

Merge branch 'master' of https://github.com/murillodigital/hifi

Browse source
This commit is contained in:
Leonardo Murillo 2015-12-14 20:20:36 -06:00
commit 0136e5fe97
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,3 +1,5 @@
### TESTING BUILD - DO NOT MERGE ###
High Fidelity (hifi) is an early-stage technology lab experimenting with Virtual Worlds and VR. High Fidelity (hifi) is an early-stage technology lab experimenting with Virtual Worlds and VR.
In this repository you'll find the source to many of the components in our In this repository you'll find the source to many of the components in our

1
cmake/modules/FindOpenSSL.cmake
View file

@ -256,6 +256,7 @@ if (WIN32)
# For some reason fixup misses the following DLL and only copies libeay32. There's gotta be a better way to handle this # For some reason fixup misses the following DLL and only copies libeay32. There's gotta be a better way to handle this
# but for now resorting to the following interm solution # but for now resorting to the following interm solution
if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE) if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
message(STATUS "*********** Copying SSL DLL from ${OPENSSL_DLL_PATH}/ssleay32.dll")
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment/ COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment/