Commit f8adbe1f authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Simplify definition of linking type in the configurations.

parent 9e0e6a95
......@@ -26,7 +26,7 @@ set(EP_antlr3c_GIT_TAG "099946426e30916ff97e4e52c3bd7d920359a933")
set(EP_antlr3c_EXTERNAL_SOURCE_PATHS "antlr3c" "antlr3" "externals/antlr3")
set(EP_antlr3c_CMAKE_OPTIONS "-DENABLE_DEBUGGER=NO")
set(EP_antlr3c_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_antlr3c_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
if(MSVC)
set(EP_antlr3c_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
......@@ -26,6 +26,6 @@ set(EP_bcg729_GIT_TAG "1.0.0")
set(EP_bcg729_EXTERNAL_SOURCE_PATHS "bcg729")
set(EP_bcg729_CMAKE_OPTIONS )
set(EP_bcg729_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_bcg729_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_bcg729_DEPENDENCIES EP_ms2)
......@@ -26,7 +26,7 @@ set(EP_bellesip_GIT_TAG "1.4.1")
set(EP_bellesip_EXTERNAL_SOURCE_PATHS "belle-sip")
set(EP_bellesip_CMAKE_OPTIONS )
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_bellesip_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_bellesip_DEPENDENCIES )
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_bellesip_DEPENDENCIES EP_antlr3c EP_polarssl)
......
......@@ -26,7 +26,7 @@ set(EP_bzrtp_GIT_TAG "1.0.2")
set(EP_bzrtp_EXTERNAL_SOURCE_PATHS "bzrtp")
set(EP_bzrtp_CMAKE_OPTIONS )
set(EP_bzrtp_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_bzrtp_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_bzrtp_DEPENDENCIES )
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_bzrtp_DEPENDENCIES EP_polarssl)
......
......@@ -25,8 +25,8 @@ set(EP_cunit_GIT_TAG_LATEST "linphone")
set(EP_cunit_GIT_TAG "f5ca2e89288638b9b86330c427b0b787a7e8ed7c")
set(EP_cunit_EXTERNAL_SOURCE_PATHS "cunit" "externals/cunit")
set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=1" "-DENABLE_CONSOLE=0")
set(EP_cunit_LINKING_TYPE "-DENABLE_STATIC=0")
set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=YES" "-DENABLE_CONSOLE=NO")
set(EP_cunit_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
if(MSVC)
set(EP_cunit_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
......@@ -25,7 +25,7 @@ set(EP_gsm_GIT_TAG_LATEST "linphone")
set(EP_gsm_GIT_TAG "57d904f7fdc97e611b4a09ff7753d5d648ff82cd")
set(EP_gsm_EXTERNAL_SOURCE_PATHS "gsm" "externals/gsm")
set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_gsm_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
if(MSVC)
set(EP_gsm_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
......
......@@ -25,8 +25,8 @@ set(EP_linphone_GIT_TAG_LATEST "master")
set(EP_linphone_GIT_TAG "3.8.2")
set(EP_linphone_EXTERNAL_SOURCE_PATHS "linphone")
set(EP_linphone_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_linphone_CMAKE_OPTIONS )
set(EP_linphone_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_linphone_DEPENDENCIES EP_bellesip EP_ortp EP_ms2)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT IOS)
# Do not build sqlite3 and xml2 on IOS, they are provided by the system
......
......@@ -26,7 +26,7 @@ set(EP_ms2_GIT_TAG "2.11.2")
set(EP_ms2_EXTERNAL_SOURCE_PATHS "mediastreamer2" "linphone/mediastreamer2")
set(EP_ms2_CMAKE_OPTIONS )
set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_ms2_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_ms2_DEPENDENCIES EP_ortp)
if(ENABLE_NON_FREE_CODECS)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_NON_FREE_CODECS=YES")
......
......@@ -26,6 +26,7 @@ set(EP_msamr_GIT_TAG "43468db707a73e7404972eb496221a35db84415e")
set(EP_msamr_EXTERNAL_SOURCE_PATHS "msamr")
set(EP_msamr_CMAKE_OPTIONS )
set(EP_msamr_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_msamr_DEPENDENCIES EP_ms2 EP_opencoreamr)
if(ENABLE_AMRNB)
......
......@@ -26,6 +26,7 @@ set(EP_msilbc_GIT_TAG "ad872a66fad6f047b7ea10625127fb865f5b359a")
set(EP_msilbc_EXTERNAL_SOURCE_PATHS "msilbc")
set(EP_msilbc_CMAKE_OPTIONS )
set(EP_msilbc_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_msilbc_DEPENDENCIES EP_ms2 EP_libilbcrfc3951)
if(MSVC)
set(EP_msilbc_EXTRA_LDFLAGS "/SAFESEH:NO")
......
......@@ -25,6 +25,7 @@ set(EP_msopenh264_GIT_TAG_LATEST "master")
set(EP_msopenh264_GIT_TAG "3ff59bdd3abf9593c7fc1cc901ccfbe7c72d4830")
set(EP_msopenh264_EXTERNAL_SOURCE_PATHS "msopenh264")
set(EP_msopenh264_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_msopenh264_CMAKE_OPTIONS )
if(APPLE)
set(EP_msopenh264_EXTRA_LDFLAGS "-Wl,-read_only_relocs,suppress")
......
......@@ -25,6 +25,7 @@ set(EP_mssilk_GIT_TAG_LATEST "master")
set(EP_mssilk_GIT_TAG "194543671ed479e756ae449a8a13d7294a46006d")
set(EP_mssilk_EXTERNAL_SOURCE_PATHS "mssilk")
set(EP_mssilk_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_mssilk_CMAKE_OPTIONS )
set(EP_mssilk_DEPENDENCIES EP_ms2)
......@@ -25,6 +25,7 @@ set(EP_mswasapi_GIT_TAG_LATEST "master")
set(EP_mswasapi_GIT_TAG "d69288a1ca0a4c9daebd7d37bc9301c9590116ba")
set(EP_mswasapi_EXTERNAL_SOURCE_PATHS "mswasapi")
set(EP_mswasapi_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_mswasapi_CMAKE_OPTIONS )
set(EP_mswasapi_EXTRA_LDFLAGS "/SAFESEH:NO")
set(EP_mswasapi_DEPENDENCIES EP_ms2)
......@@ -25,6 +25,7 @@ set(EP_mswebrtc_GIT_TAG_LATEST "master")
set(EP_mswebrtc_GIT_TAG "639429175eab2fbb3aede18a2b4b04ed304a47fe")
set(EP_mswebrtc_EXTERNAL_SOURCE_PATHS "mswebrtc")
set(EP_mswebrtc_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_mswebrtc_CMAKE_OPTIONS )
set(EP_mswebrtc_DEPENDENCIES EP_ms2)
......
......@@ -25,5 +25,6 @@ set(EP_mswp8vid_GIT_TAG_LATEST "master")
set(EP_mswp8vid_GIT_TAG "498b494573b7817ce0e61bb550603631924d9827")
set(EP_mswp8vid_EXTERNAL_SOURCE_PATHS "mswp8vid")
set(EP_mswp8vid_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_mswp8vid_CMAKE_OPTIONS )
set(EP_mswp8vid_DEPENDENCIES EP_ms2)
......@@ -39,5 +39,5 @@ else()
set(EP_opus_CMAKE_OPTIONS )
set(EP_opus_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/builders/opus/CMakeLists.txt" "<SOURCE_DIR>")
list(APPEND EP_opus_PATCH_COMMAND "COMMAND" "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/builders/opus/config.h.cmake" "<SOURCE_DIR>")
set(EP_opus_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_opus_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
endif()
......@@ -29,7 +29,7 @@ if(EP_ortp_FORCE_AUTOTOOLS)
set(EP_ortp_LINKING_TYPE "--enable-static")
set(EP_ortp_USE_AUTOGEN True)
else()
set(EP_ortp_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_ortp_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
endif()
set(EP_ortp_CMAKE_OPTIONS )
......
......@@ -25,7 +25,7 @@ set(EP_speex_GIT_TAG_LATEST "linphone")
set(EP_speex_GIT_TAG "f3df5a5451088921fe539bbb21dc4cf20704e08f")
set(EP_speex_EXTERNAL_SOURCE_PATHS "speex" "externals/speex")
set(EP_speex_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_speex_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
if(MSVC)
set(EP_speex_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
......@@ -26,4 +26,4 @@ set(EP_sqlite3_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOU
if(WIN32)
list(APPEND EP_sqlite3_PATCH_COMMAND "COMMAND" "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/builders/sqlite3/sqlite3.def" "<SOURCE_DIR>")
endif()
set(EP_sqlite3_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_sqlite3_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
......@@ -25,7 +25,7 @@ set(EP_srtp_GIT_TAG_LATEST "master")
set(EP_srtp_GIT_TAG "6271df37613cce36dfa61c97fcf751228755727c")
set(EP_srtp_EXTERNAL_SOURCE_PATHS "srtp" "externals/srtp")
set(EP_srtp_LINKING_TYPE "-DENABLE_STATIC=NO")
set(EP_srtp_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
if(MSVC)
set(EP_srtp_EXTRA_LDFLAGS "/SAFESEH:NO")
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