Define linking type in config-* files, not options-* files.

configs/config-android.cmake

@@ -23,6 +23,11 @@
 include(${CMAKE_CURRENT_LIST_DIR}/options-android.cmake)
 
 
+
+set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES" "-DENABLE_SHARED=NO")
+set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")
+
+
 # Global configuration
 set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-linux-android")
 set(CMAKE_INSTALL_RPATH "$ORIGIN")

configs/config-ios.cmake

@@ -23,6 +23,9 @@
 include(${CMAKE_CURRENT_LIST_DIR}/options-ios.cmake)
 
 
+set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES" "-DENABLE_SHARED=NO")
+
+
 set(CMAKE_MACOSX_RPATH TRUE)
 set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
 

configs/config-uwp.cmake

@@ -23,6 +23,9 @@
 include(${CMAKE_CURRENT_LIST_DIR}/options-uwp.cmake)
 
 
+set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_SHARED=YES" "-DENABLE_STATIC=NO")
+
+
 # Global configuration
 set(LINPHONE_BUILDER_CPPFLAGS "-D_ALLOW_KEYWORD_MACROS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS")
 
@@ -47,4 +50,4 @@ lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
 # opus
 lcb_builder_cmake_options(opus "-DENABLE_ASM=NO")
 lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
-set(EP_opus_LINKING_TYPE "-DENABLE_STATIC=YES")
+lcb_builder_linking_type(opus "-DENABLE_SHARED=NO" "-DENABLE_STATIC=YES")

configs/options-android.cmake

@@ -51,6 +51,3 @@ set(DEFAULT_VALUE_ENABLE_LIME ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
 set(DEFAULT_VALUE_ENABLE_JAVA_WRAPPER ON)
 set(ENABLE_NLS NO CACHE BOOL "" FORCE)
-
-set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES" "-DENABLE_SHARED=NO")
-set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")

configs/options-ios.cmake

@@ -43,6 +43,3 @@ set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_LIME ON)
 set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
 set(DEFAULT_VALUE_ENABLE_UPDATE_CHECK ON)
-
-set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES" "-DENABLE_SHARED=NO")
-

configs/options-uwp.cmake

@@ -45,5 +45,3 @@ set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
 set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(ENABLE_NLS NO CACHE BOOL "" FORCE)
-
-set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")