Commit 47689166 authored by jehan's avatar jehan
Browse files

make sure cmake run for package_source is performed with right options

parent 5205dc9e
......@@ -46,14 +46,17 @@ else()
list(APPEND EP_flexisip_DEPENDENCIES EP_ortp)
endif()
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_TRANSCODER=${ENABLE_TRANSCODER}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODB=${ENABLE_ODB}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODBC=${ENABLE_ODBC}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_REDIS=${ENABLE_REDIS}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_SOCI=${ENABLE_SOCI}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_PUSHNOTIFICATION=${ENABLE_PUSHNOTIFICATION}")
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}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_DOC=${ENABLE_DOC}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_PROTOBUF=${ENABLE_PROTOBUF}")
lcb_builder_cmake_options("flexisip"
"-DENABLE_TRANSCODER=${ENABLE_TRANSCODER}"
"-DENABLE_ODB=${ENABLE_ODB}"
"-DENABLE_ODBC=${ENABLE_ODBC}"
"-DENABLE_REDIS=${ENABLE_REDIS}"
"-DENABLE_SOCI=${ENABLE_SOCI}"
"-DENABLE_PUSHNOTIFICATION=${ENABLE_PUSHNOTIFICATION}"
"-DENABLE_PRESENCE=${ENABLE_PRESENCE}"
"-DXSDCXX_ROOT_PATH=${XSDCXX_ROOT_PATH}"
"-DENABLE_SNMP=${ENABLE_SNMP}"
"-DENABLE_DOC=${ENABLE_DOC}"
"-DENABLE_PROTOBUF=${ENABLE_PROTOBUF}"
)
......@@ -757,6 +757,7 @@ macro(linphone_builder_add_external_project PROJNAME)
linphone_builder_configure_file_for_project(${PROJNAME} CONFIGURE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Autotools/configure.rpm.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_configure_rpm.sh)
linphone_builder_configure_file_for_project(${PROJNAME} BUILD ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Autotools/build.rpm.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_build_rpm.sh)
else()
string(REPLACE ";" " " CURRENT_PROJ_CMAKE_OPTIONS "${EP_${PROJNAME}_CMAKE_OPTIONS}")
linphone_builder_configure_file_for_project(${PROJNAME} CONFIGURE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/configure.rpm.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_configure_rpm.sh)
linphone_builder_configure_file_for_project(${PROJNAME} BUILD ${CMAKE_CURRENT_SOURCE_DIR}/cmake/build.rpm.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_build_rpm.sh)
endif()
......
......@@ -2,5 +2,9 @@
cd @ep_build@
cmake @ep_source@ -DCPACK_PACKAGE_NAME=@LINPHONE_BUILDER_RPMBUILD_PACKAGE_PREFIX@@LINPHONE_BUILDER_RPMBUILD_NAME@ -DCMAKE_INSTALL_PREFIX=@RPM_INSTALL_PREFIX@ -DCMAKE_PREFIX_PATH=@RPM_INSTALL_PREFIX@
cmake @ep_source@ \
-DCPACK_PACKAGE_NAME=@LINPHONE_BUILDER_RPMBUILD_PACKAGE_PREFIX@@LINPHONE_BUILDER_RPMBUILD_NAME@ \
-DCMAKE_INSTALL_PREFIX=@RPM_INSTALL_PREFIX@ \
-DCMAKE_PREFIX_PATH=@RPM_INSTALL_PREFIX@ \
@CURRENT_PROJ_CMAKE_OPTIONS@
make package_source
......@@ -122,13 +122,13 @@ set(EP_hiredis_RPMBUILD_OPTIONS "--with bc" )
if (ENABLE_TRANSCODER)
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --with push")
else()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder")
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --without transcoder --with push")
endif()
set(EP_bellesip_RPMBUILD_OPTIONS "--with bc ")
if (ENABLE_PRESENCE)
lcb_builder_rpmbuild_name("flexisip" "flexisip-presence")
set(EP_flexisip_RPMBUILD_OPTIONS "${EP_flexisip_RPMBUILD_OPTIONS} --with presence")
endif()
......
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