From 23c8c077727ebe7436ab211766214505ed3aafd1 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 8 Oct 2016 12:21:30 +0200 Subject: [PATCH] CMake: Fix variables to match with Node package naming --- CMakeLists.txt | 6 +++--- Targets/Install/CMakeLists.txt | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a35269..75df752 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,10 +32,10 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -set(LIBWEBRTC_MAJOR_VERSION 1) +set(LIBWEBRTC_MAJOR_VERSION 0) set(LIBWEBRTC_MINOR_VERSION 0) -set(LIBWEBRTC_PATCH_VERSION 0) -set(LIBWEBRTC_BUILD_VERSION ${GIT_COMMIT_HASH}) +set(LIBWEBRTC_PATCH_VERSION 1) +set(LIBWEBRTC_BUILD_VERSION rc.1) set(LIBWEBRTC_API_VERSION "${LIBWEBRTC_MAJOR_VERSION}.${LIBWEBRTC_MINOR_VERSION}.${LIBWEBRTC_PATCH_VERSION}" diff --git a/Targets/Install/CMakeLists.txt b/Targets/Install/CMakeLists.txt index 8ed8d95..5557caf 100644 --- a/Targets/Install/CMakeLists.txt +++ b/Targets/Install/CMakeLists.txt @@ -33,16 +33,20 @@ else(WIN) set(CPACK_GENERATOR "TGZ") 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") set(LIBWEBRTC_ARCH "arm") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") - if(APPLE) - set(LIBWEBRTC_ARCH "x86") - else() - set(LIBWEBRTC_ARCH "i386") - endif() + set(LIBWEBRTC_ARCH "x86") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86.64$") - set(LIBWEBRTC_ARCH "x86_64") + set(LIBWEBRTC_ARCH "x64") elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") set(LIBWEBRTC_ARCH "ppc") elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc64") @@ -52,7 +56,7 @@ else() endif() 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") include(CPack)