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

Merge pull request #14882 from NissimHadar/21084-fixNitpickCMake

Browse source 
DNM Case 21084 - removed unneeded copying of SSL DLL's.
This commit is contained in:
Shannon Romano 2019-02-08 09:09:11 -08:00 committed by GitHub
commit 8ecaf958f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/nitpick/CMakeLists.txt
View file

@ -112,8 +112,8 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
# perform the system include hack for OS X to ignore warnings # perform the system include hack for OS X to ignore warnings
if (APPLE) if (APPLE)
foreach(EXTERNAL_INCLUDE_DIR ${${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS}) foreach(EXTERNAL_INCLUDE_DIR ${${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${EXTERNAL_INCLUDE_DIR}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${EXTERNAL_INCLUDE_DIR}")
endforeach() endforeach()
endif () endif ()
if (NOT ${${EXTERNAL}_UPPERCASE}_LIBRARIES) if (NOT ${${EXTERNAL}_UPPERCASE}_LIBRARIES)
@ -148,7 +148,7 @@ if (WIN32)
POST_BUILD POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity" COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
) )
if (RELEASE_TYPE STREQUAL "DEV") if (RELEASE_TYPE STREQUAL "DEV")
# This to enable running from the IDE # This to enable running from the IDE
add_custom_command( add_custom_command(
@ -157,13 +157,6 @@ if (WIN32)
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity" COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity"
) )
endif () endif ()
# add a custom command to copy the SSL DLLs
add_custom_command(
TARGET ${TARGET_NAME}
POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory "$ENV{VCPKG_ROOT}/installed/x64-windows/bin" "$<TARGET_FILE_DIR:${TARGET_NAME}>"
)
elseif (APPLE) elseif (APPLE)
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} TARGET ${TARGET_NAME}