Commit 68b9221d authored by jehan's avatar jehan

enable full cmake build for config « config-flexisip »

parent ebb02abb
......@@ -218,11 +218,14 @@ else()
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip sofiasip )
linphone_builder_add_builder_to_target(TARGET_flexisip odb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql )
linphone_builder_add_builder_to_target(TARGET_flexisip hiredis )
if ( ENABLE_ODB )
linphone_builder_add_builder_to_target(TARGET_flexisip odb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql )
endif()
if ( ENABLE_REDIS )
linphone_builder_add_builder_to_target(TARGET_flexisip hiredis )
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip flexisip )
endif()
......
......@@ -22,11 +22,15 @@
set(EP_flexisip_GIT_REPOSITORY "git://git.linphone.org/flexisip")
set(EP_flexisip_GIT_TAG_LATEST "master")
set(EP_flexisip_GIT_TAG "698eb5d3f66ad9b70e07b3138e487f5f487f88bc")
set(EP_flexisip_GIT_TAG "d9a1718948629a3f03dd754bc779bab41d4c9753")
set(EP_flexisip_DEPENDENCIES EP_ortp EP_sofiasip )
list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODB=${ENABLE_ODB}")
if( ENABLE_ODB )
message(STATUS "Flexisip to be built with ODB")
list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
endif()
set(EP_flexisip_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_flexisip_BUILD_METHOD "autotools")
......@@ -38,15 +42,33 @@ set(EP_flexisip_CROSS_COMPILATION_OPTIONS
)
set(EP_flexisip_CONFIG_H_FILE "flexisip.spec")
if( USE_BC_ODBC )
message(STATUS "Flexisip to be built with BC ODBC")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--with-odbc=${CMAKE_INSTALL_PREFIX}")
list(APPEND EP_flexisip_DEPENDENCIES EP_unixodbc EP_myodbc)
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODBC=${ENABLE_ODBC}")
if ( ENABLE_ODBC )
if( USE_BC_ODBC )
message(STATUS "Flexisip to be built with BC ODBC")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--with-odbc=${CMAKE_INSTALL_PREFIX}")
list(APPEND EP_flexisip_DEPENDENCIES EP_unixodbc EP_myodbc)
else()
message(STATUS "Flexisip to be built with system ODBC")
endif()
else()
message(STATUS "Flexisip to be built with system ODBC")
message(STATUS "Flexisip to be built without ODBC")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-odbc")
endif()
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_REDIS=${ENABLE_REDIS}")
if ( ENABLE_REDIS )
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--enable-redis")
endif()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_TRANSCODER=0")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder" "--enable-redis" )
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_PUSHNOTIFICATION=${ENABLE_PUSHNOTIFICATION}")
if ( ENABLE_PUSHNOTIFICATION )
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--enable-pushnotification")
else()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-pushnotification")
endif()
set(EP_flexisip_SPEC_FILE "flexisip.spec")
......@@ -22,7 +22,7 @@
set(EP_sofiasip_GIT_REPOSITORY "git://git.linphone.org/sofia-sip.git")
set(EP_sofiasip_GIT_TAG_LATEST "bc")
set(EP_sofiasip_GIT_TAG "0987c2ac14512ba5aedc9b135e40c3bef007938b")
set(EP_sofiasip_GIT_TAG "ec5145ddde0a0452999b08df4e3c61f3ff5f6730")
#set(EP_sofiasip_CMAKE_OPTIONS )
#set(EP_sofiasip_LINKING_TYPE "-DENABLE_STATIC=0")
......
......@@ -95,6 +95,10 @@ set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_ODBC ON)
set(DEFAULT_VALUE_ENABLE_ODB OFF)
set(DEFAULT_VALUE_ENABLE_REDIS ON)
set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
# Global configuration
set(LINPHONE_BUILDER_HOST "")
......
......@@ -48,18 +48,14 @@ set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_ODBC ON)
set(DEFAULT_VALUE_ENABLE_ODB OFF)
set(DEFAULT_VALUE_ENABLE_REDIS ON)
set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
# Global configuration
set(LINPHONE_BUILDER_HOST "")
if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
set(CMAKE_OSX_ARCHITECTURES "i386")
set(LINPHONE_BUILDER_HOST "i686-apple-darwin")
set(LINPHONE_BUILDER_CPPFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
set(LINPHONE_BUILDER_OBJCFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
set(LINPHONE_BUILDER_LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
endif(APPLE)
# Adjust PKG_CONFIG_PATH to include install directory
if(UNIX)
......@@ -72,4 +68,5 @@ endif()
# Include builders
include(builders/CMakeLists.txt)
set(EP_ortp_GIT_TAG "master")
\ No newline at end of file
set(EP_ortp_GIT_TAG "master")
unset(EP_flexisip_BUILD_METHOD)
......@@ -24,3 +24,13 @@
option(ENABLE_ODB "Enable odb support." ${DEFAULT_VALUE_ENABLE_ODB})
add_feature_info("ODB" ENABLE_ODB "Enable odb support.")
option(ENABLE_ODBC "Enable odbc support." ${DEFAULT_VALUE_ENABLE_ODBC})
add_feature_info("ODBC" ENABLE_ODBC "Enable odbc support.")
option(ENABLE_REDIS "Enable hiredis support." ${DEFAULT_VALUE_ENABLE_REDIS})
add_feature_info("REDIS" ENABLE_REDIS "Enable hiredis support.")
option(ENABLE_PUSHNOTIFICATION "Enable push notification support." ${DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION})
add_feature_info("PUSHNOTIFICATION" ENABLE_PUSHNOTIFICATION "Enable push notification 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