Commit 393bc2f5 authored by Ghislain MARY's avatar Ghislain MARY

Clean builders.

parent 25e67228
......@@ -28,7 +28,7 @@ include(FeatureSummary)
set(LINPHONE_BUILDER_CONFIG_FILE "configs/config-desktop.cmake" CACHE STRING "Path to the linphone builder configuration file.")
set(LINPHONE_BUILDER_WORK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/WORK" CACHE PATH "Working directory for the build.")
set(LINPHONE_BUILDER_TARGET "linphone" CACHE STRING "Target to build: one of belle-sip, ortp, ms2, ms2-plugins, linphone.")
option(LINPHONE_BUILDER_LATEST "Build latest versions (from git)." OFF)
option(LINPHONE_BUILDER_LATEST "Build latest versions (from git)." NO)
# Include macros definition to be used by builders
......@@ -65,4 +65,4 @@ linphone_builder_add_external_projects()
if("${CMAKE_VERSION}" VERSION_GREATER "2.8.2")
feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
endif("${CMAKE_VERSION}" VERSION_GREATER "2.8.2")
endif()
......@@ -34,10 +34,10 @@ if(_target_found GREATER -1)
add_dependencies(TARGET_linphone_builder TARGET_bellesip)
linphone_builder_add_builder_to_target(TARGET_bellesip antlr3c)
linphone_builder_add_builder_to_target(TARGET_bellesip polarssl)
if(${ENABLE_UNIT_TESTS})
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_bellesip cunit)
endif()
if(${ENABLE_TUNNEL})
if(ENABLE_TUNNEL)
linphone_builder_add_builder_to_target(TARGET_bellesip tunnel)
endif()
linphone_builder_add_builder_to_target(TARGET_bellesip bellesip)
......@@ -49,13 +49,13 @@ list(FIND LINPHONE_BUILDER_TARGETS "ortp" _target_found)
if(_target_found GREATER -1)
add_custom_target(TARGET_ortp ALL)
add_dependencies(TARGET_linphone_builder TARGET_ortp)
if(${ENABLE_UNIT_TESTS})
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_ortp cunit)
endif()
if(${ENABLE_SRTP})
if(ENABLE_SRTP)
linphone_builder_add_builder_to_target(TARGET_ortp srtp)
endif()
if(${ENABLE_ZRTP})
if(ENABLE_ZRTP)
linphone_builder_add_builder_to_target(TARGET_ortp polarssl)
linphone_builder_add_builder_to_target(TARGET_ortp xml2)
linphone_builder_add_builder_to_target(TARGET_ortp bzrtp)
......@@ -70,22 +70,22 @@ if(_target_found GREATER -1)
add_custom_target(TARGET_ms2 ALL)
add_dependencies(TARGET_linphone_builder TARGET_ms2)
add_dependencies(TARGET_ms2 TARGET_ortp)
if(${ENABLE_UNIT_TESTS})
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_ms2 cunit)
endif()
if(${ENABLE_GSM})
if(ENABLE_GSM)
linphone_builder_add_builder_to_target(TARGET_ms2 gsm)
endif()
if(${ENABLE_OPUS})
if(ENABLE_OPUS)
linphone_builder_add_builder_to_target(TARGET_ms2 opus)
endif()
if(${ENABLE_SPEEX})
if(ENABLE_SPEEX)
linphone_builder_add_builder_to_target(TARGET_ms2 speex)
endif()
if(${ENABLE_FFMPEG})
if(ENABLE_FFMPEG)
linphone_builder_add_builder_to_target(TARGET_ms2 ffmpeg)
endif()
if(${ENABLE_VPX})
if(ENABLE_VPX)
linphone_builder_add_builder_to_target(TARGET_ms2 vpx)
endif()
if("${BUILD_V4L}" STREQUAL "yes")
......@@ -101,33 +101,33 @@ if(_target_found GREATER -1)
add_custom_target(TARGET_ms2plugins ALL)
add_dependencies(TARGET_linphone_builder TARGET_ms2plugins)
add_dependencies(TARGET_ms2plugins TARGET_ms2 TARGET_ortp)
if(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
if(ENABLE_AMRNB OR ENABLE_AMRWB)
linphone_builder_add_builder_to_target(TARGET_ms2plugins opencoreamr)
endif()
if(${ENABLE_AMRWB})
if(ENABLE_AMRWB)
linphone_builder_add_builder_to_target(TARGET_ms2plugins voamrwbenc)
endif()
if(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
if(ENABLE_AMRNB OR ENABLE_AMRWB)
linphone_builder_add_builder_to_target(TARGET_ms2plugins msamr)
endif()
if(${ENABLE_G729})
if(ENABLE_G729)
linphone_builder_add_builder_to_target(TARGET_ms2plugins bcg729)
endif()
if(${ENABLE_ILBC})
if(ENABLE_ILBC)
linphone_builder_add_builder_to_target(TARGET_ms2plugins libilbcrfc3951)
linphone_builder_add_builder_to_target(TARGET_ms2plugins msilbc)
endif()
if(${ENABLE_ISAC} OR ${ENABLE_WEBRTC_AEC})
if(ENABLE_ISAC OR ENABLE_WEBRTC_AEC)
linphone_builder_add_builder_to_target(TARGET_ms2plugins mswebrtc)
endif()
if(${ENABLE_SILK})
if(ENABLE_SILK)
linphone_builder_add_builder_to_target(TARGET_ms2plugins mssilk)
endif()
if(${ENABLE_OPENH264})
if(ENABLE_OPENH264)
linphone_builder_add_builder_to_target(TARGET_ms2plugins openh264)
linphone_builder_add_builder_to_target(TARGET_ms2plugins msopenh264)
endif()
if(${ENABLE_X264})
if(ENABLE_X264)
linphone_builder_add_builder_to_target(TARGET_ms2plugins x264)
linphone_builder_add_builder_to_target(TARGET_ms2plugins msx264)
endif()
......@@ -141,10 +141,10 @@ if(_target_found GREATER -1)
add_dependencies(TARGET_linphone_builder TARGET_linphone)
add_dependencies(TARGET_linphone TARGET_bellesip TARGET_ortp TARGET_ms2)
linphone_builder_add_builder_to_target(TARGET_linphone xml2)
if(${ENABLE_UNIT_TESTS})
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_linphone cunit)
endif()
if(${ENABLE_TUNNEL})
if(ENABLE_TUNNEL)
linphone_builder_add_builder_to_target(TARGET_linphone tunnel)
endif()
linphone_builder_add_builder_to_target(TARGET_linphone linphone)
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_antlr3c_GIT_REPOSITORY "git://git.linphone.org/antlr3.git")
if(${LINPHONE_TARGET_LINPHONE})
if(LINPHONE_BUILDER_LATEST)
set(EP_antlr3c_GIT_TAG "linphone")
else()
set(EP_antlr3c_GIT_TAG "20985f63cb691f7ea0bdf9ccf7d5cbfda055e060")
......@@ -30,4 +30,4 @@ set(EP_antlr3c_CMAKE_OPTIONS "-DENABLE_DEBUGGER=0")
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_antlr3c_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_bcg729_GIT_REPOSITORY "git://git.linphone.org/bcg729.git")
if(${LINPHONE_BUILDER_HOST})
if(LINPHONE_BUILDER_LATEST)
set(EP_bcg729_GIT_TAG "master")
else()
set(EP_bcg729_GIT_TAG "a2fd44b70eb31485bb773925ad17e69a332c1506")
......@@ -34,4 +34,3 @@ set(EP_bcg729_CROSS_COMPILATION_OPTIONS
)
set(EP_bcg729_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_bcg729_DEPENDENCIES EP_ms2)
......@@ -21,7 +21,7 @@
############################################################################
set(EP_bellesip_GIT_REPOSITORY "git://git.linphone.org/belle-sip.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_bellesip_GIT_TAG "master")
else()
set(EP_bellesip_GIT_TAG "c6f72e9c72c8bec20f2d779c1c6ee3a0b17691c4")
......@@ -31,16 +31,16 @@ set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=0")
set(EP_bellesip_DEPENDENCIES EP_antlr3c EP_polarssl)
if(MSVC)
set(EP_bellesip_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
if(${ENABLE_TUNNEL})
if(ENABLE_TUNNEL)
list(APPEND EP_bellesip_CMAKE_OPTIONS "-DENABLE_TUNNEL=1")
list(APPEND EP_bellesip_DEPENDENCIES EP_tunnel)
else(${ENABLE_TUNNEL})
else()
list(APPEND EP_bellesip_CMAKE_OPTIONS "-DENABLE_TUNNEL=0")
endif(${ENABLE_TUNNEL})
if(${ENABLE_UNIT_TESTS})
endif()
if(ENABLE_UNIT_TESTS)
list(APPEND EP_bellesip_DEPENDENCIES EP_cunit)
else(${ENABLE_UNIT_TESTS})
else()
list(APPEND EP_bellesip_CMAKE_OPTIONS "-DENABLE_TESTS=0")
endif(${ENABLE_UNIT_TESTS})
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_bzrtp_GIT_REPOSITORY "git://git.linphone.org/bzrtp.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_bzrtp_GIT_TAG "master")
else()
set(EP_bzrtp_GIT_TAG "8ceda7ef0d35130057affc2e5a61c0667cde15aa")
......@@ -31,12 +31,12 @@ set(EP_bzrtp_LINKING_TYPE "-DENABLE_STATIC=0")
set(EP_bzrtp_DEPENDENCIES EP_polarssl EP_xml2)
if(MSVC)
set(EP_bzrtp_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
if(MINGW)
set(EP_bzrtp_EXTRA_CPPFLAGS "-D__USE_MINGW_ANSI_STDIO")
endif()
if(${ENABLE_UNIT_TESTS})
if(ENABLE_UNIT_TESTS)
list(APPEND EP_bzrtp_CMAKE_OPTIONS "-DENABLE_TESTS=1")
list(APPEND EP_bzrtp_DEPENDENCIES EP_cunit)
else()
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_cunit_GIT_REPOSITORY "git://git.linphone.org/cunit.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_cunit_GIT_TAG "linphone")
else()
set(EP_cunit_GIT_TAG "e2d5b71b83d68fbbebda20633a8d29d5863f3062")
......@@ -30,4 +30,4 @@ set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=0" "-DENABLE_CONSOLE=0")
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_cunit_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -42,21 +42,21 @@ set(EP_ffmpeg_CONFIGURE_OPTIONS
"--disable-vaapi"
"--disable-vdpau"
)
if(${ENABLE_H263})
if(ENABLE_H263)
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
"--enable-decoder=h263"
"--enable-encoder=h263"
)
endif(${ENABLE_H263})
if(${ENABLE_H263P})
endif()
if(ENABLE_H263P)
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--enable-encoder=h263p")
endif(${ENABLE_H263P})
if(${ENABLE_MPEG4})
endif()
if(ENABLE_MPEG4)
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
"--enable-decoder=mpeg4"
"--enable-encoder=mpeg4"
)
endif(${ENABLE_MPEG4})
endif()
set(EP_ffmpeg_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch")
set(EP_ffmpeg_ARCH "i386")
......@@ -65,14 +65,14 @@ if(WIN32)
set(EP_ffmpeg_TARGET_OS "mingw32")
set(EP_ffmpeg_EXTRA_LDFLAGS "-static-libgcc")
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/mingw-no-lib.patch")
else(WIN32)
else()
if(APPLE)
set(EP_ffmpeg_TARGET_OS "darwin")
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/configure-osx.patch")
else(APPLE)
else()
set(EP_ffmpeg_TARGET_OS "linux")
endif(APPLE)
endif(WIN32)
endif()
endif()
set(EP_ffmpeg_CROSS_COMPILATION_OPTIONS
"--prefix=${CMAKE_INSTALL_PREFIX}"
......@@ -80,6 +80,6 @@ set(EP_ffmpeg_CROSS_COMPILATION_OPTIONS
"--target-os=${EP_ffmpeg_TARGET_OS}"
)
if(${ENABLE_X264})
if(ENABLE_X264)
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--enable-decoder=h264")
endif(${ENABLE_X264})
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_gsm_GIT_REPOSITORY "git://git.linphone.org/gsm.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_gsm_GIT_TAG "linphone")
else()
set(EP_gsm_GIT_TAG "e59f14f7640f243d33c67f255d9e4de1c61435ba")
......@@ -30,4 +30,4 @@ set(EP_gsm_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_gsm_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_libilbcrfc3951_GIT_REPOSITORY "git://git.linphone.org/libilbc-rfc3951.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_libilbcrfc3951_GIT_TAG "master")
else()
set(EP_libilbcrfc3951_GIT_TAG "fcf42f92c13d020441a6b64e8ffe80aa4fb11885")
......@@ -33,4 +33,3 @@ set(EP_libilbcrfc3951_CROSS_COMPILATION_OPTIONS
"--host=${LINPHONE_BUILDER_HOST}"
)
set(EP_libilbcrfc3951_LINKING_TYPE "--disable-static" "--enable-shared")
......@@ -21,7 +21,7 @@
############################################################################
set(EP_msamr_GIT_REPOSITORY "git://git.linphone.org/msamr.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_msamr_GIT_TAG "master")
else()
set(EP_msamr_GIT_TAG "3f58b5ffd23555129c0c2c81e2914e3dd4cea241")
......@@ -36,14 +36,14 @@ set(EP_msamr_CROSS_COMPILATION_OPTIONS
set(EP_msamr_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_msamr_DEPENDENCIES EP_ms2 EP_opencoreamr)
if(${ENABLE_AMRNB})
if(ENABLE_AMRNB)
list(APPEND EP_msamr_CONFIGURE_OPTIONS "--enable-narrowband")
else(${ENABLE_AMRNB})
else()
list(APPEND EP_msamr_CONFIGURE_OPTIONS "--disable-narrowband")
endif(${ENABLE_AMRNB})
if(${ENABLE_AMRWB})
endif()
if(ENABLE_AMRWB)
list(APPEND EP_msamr_CONFIGURE_OPTIONS "--enable-wideband")
list(APPEND EP_msamr_DEPENDENCIES EP_voamrwbenc)
else(${ENABLE_AMRWB})
else()
list(APPEND EP_msamr_CONFIGURE_OPTIONS "--disable-wideband")
endif(${ENABLE_AMRWB})
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_msilbc_GIT_REPOSITORY "git://git.linphone.org/msilbc.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_msilbc_GIT_TAG "master")
else()
set(EP_msilbc_GIT_TAG "00bd16fc869414dc9a68a56251ed3f895f106f2f")
......@@ -34,4 +34,3 @@ set(EP_msilbc_CROSS_COMPILATION_OPTIONS
)
set(EP_msilbc_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_msilbc_DEPENDENCIES EP_ms2 EP_libilbcrfc3951)
......@@ -21,7 +21,7 @@
############################################################################
set(EP_msopenh264_GIT_REPOSITORY "git://git.linphone.org/msopenh264.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_msopenh264_GIT_TAG "master")
else()
set(EP_msopenh264_GIT_TAG "bba709ebd9fccf0ec2e895275a5bea3c27eece13")
......@@ -29,5 +29,5 @@ endif()
set(EP_msopenh264_CMAKE_OPTIONS )
if(MSVC)
set(EP_msopenh264_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
set(EP_msopenh264_DEPENDENCIES EP_ms2 EP_openh264)
......@@ -21,7 +21,7 @@
############################################################################
set(EP_mssilk_GIT_REPOSITORY "git://git.linphone.org/mssilk.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_mssilk_GIT_TAG "master")
else()
set(EP_mssilk_GIT_TAG "a5a4cd468e7a5dd95f3f18e044c245cdc4788520")
......@@ -34,4 +34,3 @@ set(EP_mssilk_CROSS_COMPILATION_OPTIONS
)
set(EP_mssilk_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_mssilk_DEPENDENCIES EP_ms2)
......@@ -21,7 +21,7 @@
############################################################################
set(EP_mswebrtc_GIT_REPOSITORY "git://git.linphone.org/mswebrtc.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_mswebrtc_GIT_TAG "master")
else()
set(EP_mswebrtc_GIT_TAG "0032453985975530356fb702c6ea46e45ecd3eb2")
......@@ -36,9 +36,9 @@ set(EP_mswebrtc_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_mswebrtc_DEPENDENCIES EP_ms2)
set(EP_mswebrtc_CONFIGURE_OPTIONS )
if(NOT ${ENABLE_ISAC})
if(NOT ENABLE_ISAC)
list(APPEND EP_mswebrtc_CONFIGURE_OPTIONS "--disable-isac")
endif()
if(NOT ${ENABLE_WEBRTC_AEC})
if(NOT ENABLE_WEBRTC_AEC)
list(APPEND EP_mswebrtc_CONFIGURE_OPTIONS "--disable-aec")
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_msx264_GIT_REPOSITORY "git://git.linphone.org/msx264.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_msx264_GIT_TAG "master")
else()
set(EP_msx264_GIT_TAG "6532dd845c59631a9149e9146ba5cf9426db906b")
......
......@@ -31,12 +31,8 @@ set(EP_opencoreamr_CROSS_COMPILATION_OPTIONS
)
set(EP_opencoreamr_LINKING_TYPE "--disable-static" "--enable-shared")
if(${ENABLE_AMRNB})
list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS
"--enable-amrnb-decoder" "--enable-amrnb-encoder"
)
else(${ENABLE_AMRNB})
list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS
"--disable-amrnb-decoder" "--disable-amrnb-encoder"
)
endif(${ENABLE_AMRNB})
if(ENABLE_AMRNB)
list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS "--enable-amrnb-decoder" "--enable-amrnb-encoder")
else()
list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS "--disable-amrnb-decoder" "--disable-amrnb-encoder")
endif()
......@@ -31,4 +31,3 @@ set(EP_opus_CONFIGURE_OPTIONS
"--disable-doc"
)
set(EP_opus_LINKING_TYPE "--disable-static" "--enable-shared")
......@@ -21,7 +21,7 @@
############################################################################
set(EP_ortp_GIT_REPOSITORY "git://git.linphone.org/ortp.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_ortp_GIT_TAG "master")
else()
set(EP_ortp_GIT_TAG "17efc3de4033649273e7d9d2742e21837f432347")
......@@ -31,13 +31,13 @@ if(MSVC)
set(EP_ortp_CMAKE_OPTIONS )
set(EP_ortp_LINKING_TYPE "-DENABLE_STATIC=0")
set(EP_ortp_DEPENDENCIES )
if(${ENABLE_SRTP})
if(ENABLE_SRTP)
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_SRTP=1")
list(APPEND EP_ortp_DEPENDENCIES EP_srtp)
else()
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_SRTP=0")
endif()
if(${ENABLE_ZRTP})
if(ENABLE_ZRTP)
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_ZRTP=1")
list(APPEND EP_ortp_DEPENDENCIES EP_bzrtp)
else()
......@@ -58,14 +58,14 @@ else()
set(EP_ortp_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_ortp_DEPENDENCIES )
if(${ENABLE_SRTP})
if(ENABLE_SRTP)
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--with-srtp=${CMAKE_INSTALL_PREFIX}")
list(APPEND EP_ortp_DEPENDENCIES EP_srtp)
else()
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--with-srtp=none")
endif()
if(${ENABLE_ZRTP})
if(ENABLE_ZRTP)
list(APPEND EP_ortp_DEPENDENCIES EP_bzrtp)
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--enable-zrtp")
else()
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_polarssl_GIT_REPOSITORY "git://git.linphone.org/polarssl.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_polarssl_GIT_TAG "linphone")
else()
set(EP_polarssl_GIT_TAG "76fbef39763168e2af4da572ffffa85960174500")
......@@ -29,4 +29,4 @@ endif()
set(EP_polarssl_LINKING_TYPE "-DUSE_SHARED_POLARSSL_LIBRARY=1")
if(MSVC)
set(EP_polarssl_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_speex_GIT_REPOSITORY "git://git.linphone.org/speex.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_speex_GIT_TAG "linphone")
else()
set(EP_speex_GIT_TAG "317a4b92abdfb2d289b3839d757ecb036233e8fc")
......@@ -29,4 +29,4 @@ endif()
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_speex_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_srtp_GIT_REPOSITORY "git://git.linphone.org/srtp.git")
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_srtp_GIT_TAG "master")
else()
set(EP_srtp_GIT_TAG "34727169f7442318922963fd491937393fa7c83c")
......@@ -29,4 +29,4 @@ endif()
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_srtp_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_tunnel_GIT_REPOSITORY "gitosis@git.linphone.org:tunnel.git") # Private repository
if(${LINPHONE_BUILDER_LATEST})
if(LINPHONE_BUILDER_LATEST)
set(EP_tunnel_GIT_TAG "master")
else()
set(EP_tunnel_GIT_TAG "e1f78f6ffa80cf226d043d88d4e6cd8029da1100")
......
......@@ -39,7 +39,7 @@ set(EP_vpx_CONFIGURE_OPTIONS
if(WIN32)
set(EP_vpx_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/vpx/enable-shared-on-windows.patch")
endif(WIN32)
endif()
if(APPLE)
set(EP_vpx_TARGET "x86-darwin10-gcc")
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared --enable-pic")
......
......@@ -43,4 +43,4 @@ set(EP_xml2_LINKING_TYPE "--disable-static" "--enable-shared")
if(WIN32)
set(EP_xml2_EXTRA_LDFLAGS "-static-libgcc")
endif(WIN32)
endif()
......@@ -28,8 +28,8 @@ include(FeatureSummary)
macro(linphone_builder_add_feature_info FEATURE_NAME FEATURE_OPTION FEATURE_DESCRIPTION)
if("${CMAKE_VERSION}" VERSION_GREATER "2.8.2")
add_feature_info("${FEATURE_NAME}" ${FEATURE_OPTION} "${FEATURE_DESCRIPTION}")
endif("${CMAKE_VERSION}" VERSION_GREATER "2.8.2")
endmacro(linphone_builder_add_feature_info)
endif()
endmacro()
option(ENABLE_VIDEO "Enable video support." ${DEFAULT_VALUE_ENABLE_VIDEO})
linphone_builder_add_feature_info("Video" ENABLE_VIDEO "Ability to capture and display video.")
......
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