Commit 4d94a5bd authored by Ghislain MARY's avatar Ghislain MARY

Remove ENABLE_SOCI_BUILD option and use soci builder using CMake for flexisip.

parent ce19b5d2
......@@ -40,7 +40,7 @@ endif()
if (ENABLE_PRESENCE)
lcb_dependencies("bellesip")
endif()
if(ENABLE_SOCI_BUILD)
if(ENABLE_SOCI)
lcb_dependencies("soci")
endif()
if (ENABLE_TRANSCODER)
......
......@@ -27,7 +27,7 @@ lcb_external_source_paths("linphone")
lcb_groupable(YES)
lcb_package_source(YES)
lcb_dependencies("bctoolbox" "bellesip" "ortp" "ms2" "belr" "libxsd")
lcb_dependencies("bctoolbox" "bellesip" "ortp" "ms2" "belr" "libxsd" "soci")
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE)
# Do not build sqlite3, xml2 and zlib on Apple systems (Mac OS X and iOS), they are provided by the system
lcb_dependencies("sqlite3" "xml2")
......@@ -41,7 +41,6 @@ endif()
if(ENABLE_VCARD)
lcb_dependencies("belcard")
endif()
lcb_dependencies("soci")
lcb_cmake_options(
"-DENABLE_GTK_UI=${ENABLE_GTK_UI}"
......
This diff is collapsed.
diff -urN EP_soci/CMakeLists.txt EP_soci.mod/CMakeLists.txt
--- EP_soci/CMakeLists.txt 2016-02-08 22:37:29.775133646 +0100
+++ EP_soci.mod/CMakeLists.txt 2016-02-08 22:39:44.963432447 +0100
@@ -73,10 +73,12 @@
# Installation
###############################################################################
-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(SOCI_LIBDIR "lib")
-else()
- set(SOCI_LIBDIR "lib64")
+if(NOT DEFINED SOCI_LIBDIR)
+ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(SOCI_LIBDIR "lib")
+ else()
+ set(SOCI_LIBDIR "lib64")
+ endif()
endif()
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
......@@ -58,9 +58,6 @@ ENDFOREACH()
set(FLEXISIP_LIBDEPS ssl mysqlclient_r mysqlclient)
if(PLATFORM STREQUAL "Debian")
set(DEFAULT_VALUE_ENABLE_SOCI_BUILD ON)
endif()
FOREACH(LIBNAME ${FLEXISIP_LIBDEPS})
CHECK_LIBRARY(${LIBNAME})
......
......@@ -32,7 +32,6 @@ lcb_add_option("Presence" "Enable presence server support." "${DEFAULT_VALUE_ENA
lcb_add_option("Conference" "Enable conference server support." "${DEFAULT_VALUE_ENABLE_CONFERENCE}")
lcb_add_option("SNMP" "Enable SNMP support." "${DEFAULT_ENABLE_SNMP}")
lcb_add_option("SOCI" "Enable SOCI support." "${DEFAULT_ENABLE_SOCI}")
lcb_add_dependent_option("SOCI build" "Build SOCI from sources instead of taking the operating system version." "${DEFAULT_VALUE_ENABLE_SOCI_BUILD}" "ENABLE_SOCI" OFF)
lcb_add_option("Transcoder" "Enable transcoder support." "${DEFAULT_ENABLE_TRANSCODER}")
lcb_add_option("PROTOBUF" "Enable protobuf for REDIS." "${DEFAULT_ENABLE_PROTOBUF}" "ENABLE_PROTOBUF" OFF)
......
......@@ -29,4 +29,4 @@ lcb_define_target("ms2" "ortp")
lcb_define_target("ms2plugins" "ms2")
lcb_define_target("linphone" "bellesip" "ms2plugins" "belr")
lcb_define_target("odb")
lcb_define_target("flexisip" "ortp")
lcb_define_target("flexisip" "linphone")
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