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

Checkpoint

Browse source
This commit is contained in:
Leonardo Murillo 2015-12-01 12:32:31 -06:00
parent 418b9c8fea
commit ca8cd13c48
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/ConsolidateStackComponents.cmake
View file

@ -1,6 +1,6 @@
macro(CONSOLIDATE_STACK_COMPONENTS) macro(CONSOLIDATE_STACK_COMPONENTS)
if (DEFINED ENV{ghprbPullId}) if (DEFINED ENV{ghprbPullId} AND WIN32)
# Copy all the output for this target into the common deployment location # Copy all the output for this target into the common deployment location
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD TARGET ${TARGET_NAME} POST_BUILD

12
cmake/modules/FindOpenSSL.cmake
View file

@ -107,7 +107,7 @@ if (WIN32 AND NOT CYGWIN)
select_library_configurations(SSL_EAY) select_library_configurations(SSL_EAY)
set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY}) set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS}) find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS})
elseif (MINGW) elseif (MINGW)
@ -250,8 +250,18 @@ else ()
) )
endif () endif ()
message(STATUS "++++++++++++++++++++++++++++")
message(STATUS "${OPENSSL_LIBRARIES}")
message(STATUS "${OPENSSL_DLL_PATH}")
if (WIN32) if (WIN32)
add_paths_to_fixup_libs(${OPENSSL_DLL_PATH}) add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
if (DEFINED ENV{ghprbPullId})
add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment
)
endif ()
endif () endif ()
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS) mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)