Commit 6f1909b7 authored by johan's avatar johan

Merge branch 'master' into ecc

parents 35be3bee 4841d2a1
......@@ -224,5 +224,7 @@ install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/BcToolboxConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/BcToolboxConfigVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/BcToolboxCMakeUtils.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/BcGitVersion.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/gitversion.h.in"
DESTINATION ${CONFIG_PACKAGE_LOCATION}
)
############################################################################
# BcGitVersion.cmake
# Copyright (C) 2017 Belledonne Communications, Grenoble France
#
############################################################################
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
############################################################################
if(GIT_EXECUTABLE)
macro(GIT_COMMAND OUTPUT_VAR)
set(GIT_ARGS ${ARGN})
execute_process(
COMMAND ${GIT_EXECUTABLE} ${ARGN}
WORKING_DIRECTORY ${WORK_DIR}
OUTPUT_VARIABLE ${OUTPUT_VAR}
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endmacro()
GIT_COMMAND(GIT_DESCRIBE describe --always)
GIT_COMMAND(GIT_TAG describe --abbrev=0)
GIT_COMMAND(GIT_REVISION rev-parse HEAD)
endif()
string(TOUPPER "${PROJECT_NAME}" PREFIX_GIT_VERSION)
string(REPLACE "-" "_" PREFIX_GIT_VERSION "${PREFIX_GIT_VERSION}")
if(GIT_DESCRIBE)
if(NOT GIT_TAG STREQUAL PROJECT_VERSION)
message(FATAL_ERROR "Project version (${PROJECT_VERSION}) and git tag (${GIT_TAG}) differ. Please put them identical")
endif()
set(PROJECT_GIT_VERSION "${GIT_DESCRIBE}")
configure_file("${TEMPLATE_DIR}/gitversion.h.in" "${OUTPUT_DIR}/gitversion.h" @ONLY)
elseif(GIT_REVISION)
set(PROJECT_GIT_VERSION "${LINPHONE_VERSION}_${GIT_REVISION}")
configure_file("${TEMPLATE_DIR}/gitversion.h.in" "${OUTPUT_DIR}/gitversion.h" @ONLY)
else()
if(NOT EXISTS "${OUTPUT_DIR}/gitversion.h")
execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${OUTPUT_DIR}/gitversion.h")
endif()
endif()
......@@ -20,6 +20,7 @@
#
############################################################################
set(BCTOOLBOX_CMAKE_UTILS_DIR "${CMAKE_CURRENT_LIST_DIR}")
macro(bc_apply_compile_flags SOURCE_FILES)
if(${SOURCE_FILES})
......@@ -36,17 +37,10 @@ macro(bc_apply_compile_flags SOURCE_FILES)
endif()
endmacro()
macro(bc_set_libraries_from_static_target LIBRARIES TARGET_NAME)
if(TARGET ${TARGET_NAME})
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
set(${LIBRARIES} ${TARGET_NAME})
else()
get_target_property(${LIBRARIES} ${TARGET_NAME} LOCATION)
endif()
get_target_property(_link_libraries ${TARGET_NAME} INTERFACE_LINK_LIBRARIES)
if(_link_libraries)
list(APPEND ${LIBRARIES} ${_link_libraries})
endif()
endif()
macro(bc_git_version PROJECT_NAME PROJECT_VERSION)
find_package(Git)
add_custom_target(${PROJECT_NAME}-git-version
COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPROJECT_NAME=${PROJECT_NAME} -DPROJECT_VERSION=${PROJECT_VERSION} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DTEMPLATE_DIR=${BCTOOLBOX_CMAKE_UTILS_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${BCTOOLBOX_CMAKE_UTILS_DIR}/BcGitVersion.cmake
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/gitversion.h"
)
endmacro()
/*
linphone
Copyright (C) 2010-2017 Belledonne Communications SARL
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#define @PREFIX_GIT_VERSION@_GIT_VERSION "@PROJECT_GIT_VERSION@"
\ No newline at end of file
......@@ -247,6 +247,7 @@ BCTBX_PUBLIC int __bctbx_WIN_inet_aton (const char * cp, struct in_addr * addr);
#define BCTBX_ENETUNREACH WSAENETUNREACH
#define BCTBX_EHOSTUNREACH WSAEHOSTUNREACH
#define BCTBX_ENOTCONN WSAENOTCONN
#define BCTBX_EPROTOTYPE WSAEPROTOTYPE /* Protocol wrong type for socket */
#if defined(_WIN32_WCE)
......
......@@ -84,7 +84,7 @@ endif()
if(ENABLE_SHARED)
add_library(bctoolbox SHARED ${BCTOOLBOX_SOURCE_FILES} ${BCTOOLBOX_HEADER_FILES})
target_link_libraries(bctoolbox PRIVATE ${CMAKE_THREAD_LIBS_INIT})
if(APPLE)
if(IOS)
set_target_properties(bctoolbox PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER com.belledonne-communications.bctoolbox
......@@ -99,13 +99,7 @@ if(ENABLE_SHARED)
if(NOT CMAKE_VERSION VERSION_LESS 3.1)
set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION})
endif()
......@@ -130,13 +124,7 @@ if(ENABLE_SHARED)
if(WIN32)
target_compile_definitions(bctoolbox-tester PRIVATE "-DBCTBX_EXPORTS")
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(bctoolbox-tester PROPERTIES SOVERSION ${BCTOOLBOXTESTER_SO_VERSION})
endif()
......@@ -193,7 +181,7 @@ if(BCUNIT_FOUND)
if(ENABLE_SHARED)
target_include_directories(bctoolbox-tester PUBLIC ${BCUNIT_INCLUDE_DIRS})
target_link_libraries(bctoolbox-tester PRIVATE bctoolbox ${BCUNIT_LIBRARIES})
if(APPLE)
if(IOS)
set_target_properties(bctoolbox-tester PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER com.belledonne-communications.bctoolbox-tester
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment