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

CMake: Fix variables to match with Node package naming

Browse source
This commit is contained in:
Axel Isouard 2016-10-08 12:21:30 +02:00
parent dc8485bd17
commit 23c8c07772
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -32,10 +32,10 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
set(LIBWEBRTC_MAJOR_VERSION 1) set(LIBWEBRTC_MAJOR_VERSION 0)
set(LIBWEBRTC_MINOR_VERSION 0) set(LIBWEBRTC_MINOR_VERSION 0)
set(LIBWEBRTC_PATCH_VERSION 0) set(LIBWEBRTC_PATCH_VERSION 1)
set(LIBWEBRTC_BUILD_VERSION ${GIT_COMMIT_HASH}) set(LIBWEBRTC_BUILD_VERSION rc.1)
set(LIBWEBRTC_API_VERSION set(LIBWEBRTC_API_VERSION
"${LIBWEBRTC_MAJOR_VERSION}.${LIBWEBRTC_MINOR_VERSION}.${LIBWEBRTC_PATCH_VERSION}" "${LIBWEBRTC_MAJOR_VERSION}.${LIBWEBRTC_MINOR_VERSION}.${LIBWEBRTC_PATCH_VERSION}"

16
Targets/Install/CMakeLists.txt
View file

@ -33,16 +33,20 @@ else(WIN)
set(CPACK_GENERATOR "TGZ") set(CPACK_GENERATOR "TGZ")
endif(WIN) endif(WIN)
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(LIBWEBRTC_PLATFORM "linux")
elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(LIBWEBRTC_PLATFORM "mac")
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
set(LIBWEBRTC_PLATFORM "win32")
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
set(LIBWEBRTC_ARCH "arm") set(LIBWEBRTC_ARCH "arm")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
if(APPLE)
set(LIBWEBRTC_ARCH "x86") set(LIBWEBRTC_ARCH "x86")
else()
set(LIBWEBRTC_ARCH "i386")
endif()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86.64$") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86.64$")
set(LIBWEBRTC_ARCH "x86_64") set(LIBWEBRTC_ARCH "x64")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc")
set(LIBWEBRTC_ARCH "ppc") set(LIBWEBRTC_ARCH "ppc")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc64") elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc64")
@ -52,7 +56,7 @@ else()
endif() endif()
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
set(CPACK_PACKAGE_FILE_NAME "libwebrtc-${GIT_COMMIT_TAG}-${CMAKE_SYSTEM_NAME}-${LIBWEBRTC_ARCH}") set(CPACK_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}-${LIBWEBRTC_PLATFORM}-${LIBWEBRTC_ARCH}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "libwebrtc") set(CPACK_PACKAGE_INSTALL_DIRECTORY "libwebrtc")
include(CPack) include(CPack)