Build vpx out-of-tree.

builders/vpx.cmake

@@ -37,6 +37,7 @@ else()
 	set(EP_vpx_URL_HASH "MD5=14783a148872f2d08629ff7c694eb31f")
 	set(EP_vpx_EXTERNAL_SOURCE_PATHS "externals/libvpx")
 	set(EP_vpx_BUILD_METHOD "autotools")
+	set(EP_vpx_DO_NOT_USE_CMAKE_FLAGS TRUE)
 	set(EP_vpx_CONFIG_H_FILE vpx_config.h)
 	set(EP_vpx_CONFIGURE_OPTIONS
 		"--enable-error-concealment"
@@ -66,6 +67,7 @@ else()
 			elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 				set(EP_vpx_TARGET "x86_64-iphonesimulator-gcc")
 			else()
+				set(EP_vpx_TARGET "x86-iphonesimulator-gcc")
 			endif()
 		else()
 			if(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
@@ -75,7 +77,6 @@ else()
 			endif()
 		endif()
 		set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
-		set(EP_vpx_BUILD_IN_SOURCE "yes")
 	else()
 		if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 			set(EP_vpx_TARGET "x86_64-linux-gcc")

cmake/LinphoneCMakeBuilder.cmake

@@ -516,7 +516,9 @@ function(linphone_builder_add_project PROJNAME)
 	endif()
 
 	linphone_builder_set_ep_directories(${PROJNAME})
-	linphone_builder_apply_cmake_flags_to_autotools_project(${PROJNAME})
+	if(NOT EP_${PROJNAME}_DO_NOT_USE_CMAKE_FLAGS)
+		linphone_builder_apply_cmake_flags_to_autotools_project(${PROJNAME})
+	endif()
 	linphone_builder_apply_extra_flags(${PROJNAME})
 	linphone_builder_expand_external_project_vars()