Commit 3faa8eff authored by jehan's avatar jehan

improve flexisip support

parent 34f2b6c6
......@@ -74,3 +74,5 @@ endif()
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_PRESENCE=${ENABLE_PRESENCE}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DXSDCXX_ROOT_PATH=${XSDCXX_ROOT_PATH}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_SNMP=${ENABLE_SNMP}")
......@@ -23,7 +23,7 @@
set(EP_sofiasip_GIT_REPOSITORY "git://git.linphone.org/sofia-sip.git" CACHE STRING "sofiasip repository URL")
set(EP_sofiasip_GIT_TAG_LATEST "bc" CACHE STRING "sofiasip tag to use when compiling latest version")
set(EP_sofiasip_GIT_TAG "ec5145ddde0a0452999b08df4e3c61f3ff5f6730" CACHE STRING "sofiasip tag to use")
set(EP_sofiasip_EXTERNAL_SOURCE_PATHS "externals/sofia-sip")
#set(EP_sofiasip_CMAKE_OPTIONS )
#set(EP_sofiasip_LINKING_TYPE "-DENABLE_STATIC=0")
......
......@@ -29,6 +29,7 @@ set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
set(DEFAULT_VALUE_ENABLE_REDIS ON)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
set(DEFAULT_VALUE_ENABLE_PRESENCE OFF)
set(DEFAULT_VALUE_ENABLE_SNMP ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
......@@ -63,8 +64,19 @@ if(UNIX)
else() # Windows
set(LINPHONE_BUILDER_PKG_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/")
endif()
if(APPLE)
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) #is it still usefull ?
#without instruction chose to target current machine
execute_process(COMMAND sw_vers -productVersion COMMAND awk -F \\. "{printf \"%i.%i\",$1,$2}" RESULT_VARIABLE xcrun_sdk_version OUTPUT_VARIABLE CMAKE_OSX_DEPLOYMENT_TARGET OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
set(CMAKE_MACOSX_RPATH 1)
endif()
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" _IS_SYSTEM_DIR)
if("${_IS_SYSTEM_DIR}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
message("cmake install rpath: ${CMAKE_INSTALL_RPATH}")
# Include builders
include(builders/CMakeLists.txt)
......
......@@ -40,3 +40,6 @@ add_feature_info("PRESENCE" ENABLE_PRESENCE "Enable presence server.")
option(XSDCXX_ROOT_PATH "Path of where the bin/xsdcxx executable will be found. Comes from http://www.codesynthesis.com/products/xsd/download.xhtml" "/usr" )
add_feature_info("XSDCXX_ROOT_PATH" XSDCXX_ROOT_PATH "Path of where the bin/xsdcxx executable will be found. Comes from http://www.codesynthesis.com/products/xsd/download.xhtml")
option(ENABLE_SNMP "Enable SNMP support" ${DEFAULT_ENABLE_SNMP} )
add_feature_info("ENABLE_SNMP" ENABLE_SNMP "Enable SNMP support")
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