UltraCoder/libwebrtc
1
0
Fork 0
mirror of https://github.com/UltraCoderRU/libwebrtc.git synced 2026-01-28 03:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

No prefix file for gn command anymore, set the right directory for IDE config

Browse source
This commit is contained in:
Axel Isouard 2017-03-19 04:30:25 -07:00
parent ea5d4643aa
commit 5d3887b918
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -80,6 +80,14 @@ ExternalProject_Add(
-DWEBRTC_ROOT_DIR:PATH=${CMAKE_BINARY_DIR} -DWEBRTC_ROOT_DIR:PATH=${CMAKE_BINARY_DIR}
) )
if (MSVC OR XCODE)
set(_CONFIG $<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:Release>$<$<CONFIG:MinSizeRel>:Release>)
elseif (CMAKE_BUILD_TYPE MATCHES Debug)
set(_CONFIG Debug)
else (MSVC OR XCODE)
set(_CONFIG Release)
endif (MSVC OR XCODE)
ExternalProject_Add( ExternalProject_Add(
libwebrtc libwebrtc
DEPENDS webrtc-src DEPENDS webrtc-src
@ -91,7 +99,7 @@ ExternalProject_Add(
CMAKE_ARGS CMAKE_ARGS
-DLIBRARY_TYPE:STRING=${LIBRARY_TYPE} -DLIBRARY_TYPE:STRING=${LIBRARY_TYPE}
-DTARGET_OS:STRING=${TARGET_OS} -DTARGET_OS:STRING=${TARGET_OS}
-DWEBRTC_OUTPUT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc/src/out/Default -DWEBRTC_OUTPUT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc/src/out/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:Release>$<$<CONFIG:MinSizeRel>:Release>
-DWEBRTC_SOURCE_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc/src/webrtc -DWEBRTC_SOURCE_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc/src/webrtc
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

19
CMakeModules/Gn.cmake
View file

@ -2,10 +2,13 @@ set(_GEN_ARGS "use_gold=false target_cpu=\\\"${TARGET_CPU}\\\" target_os=\\\"${T
if (MSVC OR XCODE) if (MSVC OR XCODE)
set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$<CONFIG:Debug>:true>$<$<CONFIG:Release>:false>$<$<CONFIG:RelWithDebInfo>:false>$<$<CONFIG:MinSizeRel>:false>) set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$<CONFIG:Debug>:true>$<$<CONFIG:Release>:false>$<$<CONFIG:RelWithDebInfo>:false>$<$<CONFIG:MinSizeRel>:false>)
set(_NINJA_BUILD_DIR out/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:Release>$<$<CONFIG:MinSizeRel>:Release>)
elseif (CMAKE_BUILD_TYPE MATCHES Debug) elseif (CMAKE_BUILD_TYPE MATCHES Debug)
set(_GEN_ARGS "${_GEN_ARGS} is_debug=true") set(_GEN_ARGS "${_GEN_ARGS} is_debug=true")
set(_NINJA_BUILD_DIR out/Debug)
else (MSVC OR XCODE) else (MSVC OR XCODE)
set(_GEN_ARGS "${_GEN_ARGS} is_debug=false") set(_GEN_ARGS "${_GEN_ARGS} is_debug=false")
set(_NINJA_BUILD_DIR out/Release)
endif (MSVC OR XCODE) endif (MSVC OR XCODE)
if (BUILD_TESTS) if (BUILD_TESTS)
@ -18,18 +21,4 @@ if (GN_EXTRA_ARGS)
set(_GEN_ARGS "${_GEN_ARGS} ${GN_EXTRA_ARGS}") set(_GEN_ARGS "${_GEN_ARGS} ${GN_EXTRA_ARGS}")
endif (GN_EXTRA_ARGS) endif (GN_EXTRA_ARGS)
set(_GN_OUT_DIR out/Default) set(_GEN_COMMAND gn gen ${_NINJA_BUILD_DIR} --args=\"${_GEN_ARGS}\")
set(_GEN_COMMAND_LINE gn gen ${_GN_OUT_DIR} --args=\"${_GEN_ARGS}\")
if (WIN32)
set(_SCRIPT_SUFFIX .bat)
elseif (UNIX)
set(_SCRIPT_SUFFIX .sh)
set(_GEN_COMMAND sh)
endif (WIN32)
string(REPLACE ";" " " _GEN_COMMAND_STR "${_GEN_COMMAND_LINE}")
set(_GN_SCRIPT_FILENAME ${WEBRTC_PARENT_DIR}/gn-gen${_SCRIPT_SUFFIX})
file(WRITE ${_GN_SCRIPT_FILENAME} ${_GEN_COMMAND_STR})
set(_GEN_COMMAND ${_GEN_COMMAND} ${_GN_SCRIPT_FILENAME})

2
webrtc/CMakeLists.txt.in
View file

@ -95,7 +95,7 @@ libwebrtc_command(
DEPENDS webrtc-clang ${_DEPENDENCIES} DEPENDS webrtc-clang ${_DEPENDENCIES}
) )
set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C out/Default pc) set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} pc)
libwebrtc_command( libwebrtc_command(
NAME webrtc-build NAME webrtc-build
COMMAND ${_NINJA_COMMAND} COMMAND ${_NINJA_COMMAND}