CMake: Add merge_libs_wrapper.py script for Windows platform

This commit is contained in:
Axel Isouard 2016-10-16 17:11:06 +02:00
parent 86bb881422
commit a30090ad82
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
2 changed files with 11 additions and 2 deletions

View file

@ -44,11 +44,11 @@ add_libwebrtc_command(libwebrtc_build
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_LIB_DIR}) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_LIB_DIR})
set(MERGE_COMMAND set(MERGE_COMMAND
python webrtc/build/merge_libs.py out/Default ${LIBWEBRTC_LIBRARY_PATH}) python ${CMAKE_SOURCE_DIR}/merge_libs_wrapper.py src/out/Default ${LIBWEBRTC_LIBRARY_PATH})
add_libwebrtc_command(libwebrtc_merge add_libwebrtc_command(libwebrtc_merge
${LIBWEBRTC_LIBRARY_PATH} ${LIBWEBRTC_LIBRARY_PATH}
"${MERGE_COMMAND}" "${MERGE_COMMAND}"
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}
"Merging libraries into ${LIBWEBRTC_LIBRARY_NAME}" "Merging libraries into ${LIBWEBRTC_LIBRARY_NAME}"
libwebrtc_build) libwebrtc_build)

9
merge_libs_wrapper.py Normal file
View file

@ -0,0 +1,9 @@
import os
import sys
import vs_toolchain
if sys.platform == 'win32':
vs_toolchain.GetToolchainDir()
os.environ['PATH'] += os.pathsep + os.environ['GYP_MSVS_OVERRIDE_PATH'] + '\\VC\\bin'
execfile('src/webrtc/build/merge_libs.py')