Complete compilation of mediastreamer2 with CMake when compiling with Visual Studio.

builders/ms2.cmake

@@ -21,15 +21,51 @@
 ############################################################################
 
 set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
-if(${LINPHONE_BUILDER_LATEST})
+if(LINPHONE_BUILDER_LATEST)
 	set(EP_ms2_GIT_TAG "master")
 else()
 	set(EP_ms2_GIT_TAG "b84ad6280a29fb55ff0de3b26c710c2c31f83055")
 endif()
 
 if(MSVC)
-	# Use temporary CMake build scripts for Windows. TODO: Port fully to CMake.
-	set(EP_ms2_DEPENDENCIES EP_ortp EP_opus EP_speex EP_ffmpeg EP_vpx)
+	set(EP_ms2_CMAKE_OPTIONS )
+	set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=NO")
+	set(EP_ms2_DEPENDENCIES EP_ortp)
+	if(ENABLE_GSM)
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_GSM=YES")
+		list(APPEND EP_ms2_DEPENDENCIES EP_gsm)
+	else()
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_GSM=NO")
+	endif()
+	if(ENABLE_OPUS)
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_OPUS=YES")
+		list(APPEND EP_ms2_DEPENDENCIES EP_opus)
+	else()
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_OPUS=NO")
+	endif()
+	if(ENABLE_SPEEX)
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SPEEX=YES")
+		list(APPEND EP_ms2_DEPENDENCIES EP_speex)
+	else()
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SPEEX=NO")
+	endif()
+	if(ENABLE_VIDEO)
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_VIDEO=YES")
+		if(ENABLE_FFMPEG)
+			list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_FFMPEG=YES")
+			list(APPEND EP_ms2_DEPENDENCIES EP_ffmpeg)
+		else()
+			list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_FFMPEG=NO")
+		endif()
+		if(ENABLE_VPX)
+			list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_VPX=YES")
+			list(APPEND EP_ms2_DEPENDENCIES EP_vpx)
+		else()
+			list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_VPX=NO")
+		endif()
+	else()
+		list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_VIDEO=NO")
+	endif()
 	set(EP_ms2_EXTRA_LDFLAGS "/SAFESEH:NO")
 else()
 	set(EP_ms2_BUILD_METHOD "autotools")
@@ -47,38 +83,38 @@ else()
 	set(EP_ms2_LINKING_TYPE "--disable-static" "--enable-shared")
 	set(EP_ms2_DEPENDENCIES EP_ortp)
 
-	if(${ENABLE_GSM})
+	if(ENABLE_GSM)
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--with-gsm=${CMAKE_INSTALL_PREFIX}")
 		list(APPEND EP_ms2_DEPENDENCIES EP_gsm)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-gsm")
 	endif()
 
-	if(${ENABLE_OPUS})
+	if(ENABLE_OPUS)
 		list(APPEND EP_ms2_DEPENDENCIES EP_opus)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-opus")
 	endif()
 
-	if(${ENABLE_SPEEX})
+	if(ENABLE_SPEEX)
 		list(APPEND EP_ms2_DEPENDENCIES EP_speex)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-speex")
 	endif()
 
-	if(${ENABLE_VIDEO})
+	if(ENABLE_VIDEO)
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--enable-video")
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-video")
 	endif()
 
-	if(${ENABLE_FFMPEG})
+	if(ENABLE_FFMPEG)
 		list(APPEND EP_ms2_DEPENDENCIES EP_ffmpeg)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-ffmpeg")
 	endif()
 
-	if(${ENABLE_VPX})
+	if(ENABLE_VPX)
 		list(APPEND EP_ms2_DEPENDENCIES EP_vpx)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-vp8")
@@ -88,7 +124,7 @@ else()
 		list(APPEND EP_ms2_DEPENDENCIES EP_v4l)
 	endif()
 
-	if(${ENABLE_UNIT_TESTS})
+	if(ENABLE_UNIT_TESTS)
 		list(APPEND EP_ms2_DEPENDENCIES EP_cunit)
 	else()
 		list(APPEND EP_ms2_CONFIGURE_OPTIONS "--disable-tests")