Commit 054456a2 authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI
Browse files

Generate odb even for RPM

parent 4c6d235f
......@@ -161,11 +161,9 @@ if(_target_found GREATER -1)
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc )
linphone_builder_add_builder_to_target(TARGET_flexisip sofiasip )
if(PLATFORM STREQUAL "Debian")
message( STATUS "Adding odb libs dependencies for Debian")
linphone_builder_add_builder_to_target(TARGET_flexisip libodb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql )
endif()
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 flexisip )
endif()
......@@ -30,9 +30,7 @@ endif()
set(EP_flexisip_DEPENDENCIES EP_ortp EP_unixodbc EP_myodbc EP_sofiasip )
if(PLATFORM STREQUAL "Debian")
list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
endif()
list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
set(EP_flexisip_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_flexisip_BUILD_METHOD "autotools")
......
......@@ -27,7 +27,7 @@ set(EP_libodb_BUILD_METHOD "rpm")
set(EP_libodb_SPEC_FILE "libodb.spec" )
set(EP_libodb_CONFIG_H_FILE "${CMAKE_CURRENT_SOURCE_DIR}/builders/libodb/${EP_libodb_SPEC_FILE}" )
# set(EP_libodb_DEPENDENCIES EP_odb)
set(EP_libodb_DEPENDENCIES EP_odb)
#create source dir and copy the tar.gz inside
set(EP_libodb_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${LINPHONE_BUILDER_WORK_DIR}/rpmbuild/SOURCES/")
......
......@@ -28,6 +28,8 @@ set(EP_odb_BUILD_METHOD "rpm")
set(EP_odb_SPEC_FILE "odb.spec" )
set(EP_odb_CONFIG_H_FILE "${CMAKE_CURRENT_SOURCE_DIR}/builders/odb/${EP_odb_SPEC_FILE}" )
set(EP_odb_RPMBUILD_NAME "odb-")
#create source dir and copy the tar.gz inside
set(EP_odb_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${LINPHONE_BUILDER_WORK_DIR}/rpmbuild/SOURCES/")
set(EP_odb_PATCH_COMMAND ${EP_odb_PATCH_COMMAND} "COMMAND" "${CMAKE_COMMAND}" "-E" "copy" "${LINPHONE_BUILDER_WORK_DIR}/Download/EP_odb/${odb_filename}" "${LINPHONE_BUILDER_WORK_DIR}/rpmbuild/SOURCES/")
......
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