Commit 2639ef04 authored by Erwan Croze's avatar Erwan Croze 👋🏻
Browse files

Fixing soci build for soci 4.0

parent aeee4dda
...@@ -26,7 +26,6 @@ if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE) ...@@ -26,7 +26,6 @@ if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE)
# Do not build sqlite3 on Apple systems (Mac OS X and iOS), they are provided by the system # Do not build sqlite3 on Apple systems (Mac OS X and iOS), they are provided by the system
lcb_dependencies("sqlite3") lcb_dependencies("sqlite3")
endif() endif()
lcb_may_be_found_on_system(YES)
lcb_cmake_options( lcb_cmake_options(
"-DSOCI_TESTS=NO" "-DSOCI_TESTS=NO"
...@@ -40,5 +39,7 @@ lcb_cmake_options( ...@@ -40,5 +39,7 @@ lcb_cmake_options(
"-DWITH_POSTGRESQL=NO" "-DWITH_POSTGRESQL=NO"
"-DWITH_SQLITE3=YES" "-DWITH_SQLITE3=YES"
) )
lcb_package_source(YES)
lcb_spec_file("soci.spec")
lcb_linking_type("-DSOCI_SHARED=YES" "-DSOCI_STATIC=NO") lcb_linking_type("-DSOCI_SHARED=YES" "-DSOCI_STATIC=NO")
...@@ -79,6 +79,13 @@ lcb_builder_cmake_options(bctoolbox "-DENABLE_TESTS_COMPONENT=NO") ...@@ -79,6 +79,13 @@ lcb_builder_cmake_options(bctoolbox "-DENABLE_TESTS_COMPONENT=NO")
# Include builders # Include builders
include(builders/CMakeLists.txt) include(builders/CMakeLists.txt)
lcb_builder_build_method(soci "rpm")
lcb_builder_rpmbuild_options(soci
"--with bc"
"--with sqlite3"
"--with mysql"
)
lcb_builder_build_method(ortp "rpm") lcb_builder_build_method(ortp "rpm")
lcb_builder_rpmbuild_options(ortp "--with bc") lcb_builder_rpmbuild_options(ortp "--with bc")
......
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