Use CMake to build CUnit.

builders/cunit.cmake

@@ -20,4 +20,4 @@
 #
 ############################################################################
 
-linphone_builder_add_autotools_project(cunit)
+linphone_builder_add_cmake_project(cunit)

builders/cunit/build.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_cunit_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_cunit_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_cunit_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_cunit_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-make V=@CMAKE_VERBOSE_MAKEFILE@

builders/cunit/configure.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_cunit_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_cunit_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_cunit_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_cunit_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-if [ ! -f config.h ]; then
-	./autogen.sh
-	./configure "--prefix=@CMAKE_INSTALL_PREFIX@" "--host=@LINPHONE_BUILDER_TOOLCHAIN_HOST@" @EP_cunit_CONFIGURE_OPTIONS@
-fi

builders/cunit/install.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_cunit_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_cunit_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_cunit_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_cunit_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-make V=@CMAKE_VERBOSE_MAKEFILE@ install

configs/config-bb10.cmake

@@ -24,7 +24,7 @@ set(AUTOTOOLS_SHARED_LIBRARIES "--disable-static --enable-shared")
 set(CMAKE_SHARED_LIBRARIES "-DENABLE_STATIC=0")
 
 # cunit
-set(EP_cunit_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES}")
+set(EP_cunit_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_cunit_CMAKE_OPTIONS}")
 
 # xml2
 set(EP_xml2_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_xml2_CONFIGURE_OPTIONS}")
@@ -33,11 +33,11 @@ set(EP_xml2_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_xml2_CONFIGURE
 set(EP_antlr3c_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_antlr3c_CMAKE_OPTIONS}")
 
 # polarssl
-set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1")
+set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1 ${EP_polarssl_CMAKE_OPTIONS}")
 
 # bellesip
 set(EP_bellesip_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_bellesip_CONFIGURE_OPTIONS}")
-set(EP_bellesip_EXTRA_CFLAGS "-Wno-error=pragmas -DUSE_STRUCT_RES_STATE_NAMESERVERS")
+set(EP_bellesip_EXTRA_CFLAGS "-Wno-error=pragmas -DUSE_STRUCT_RES_STATE_NAMESERVERS ${EP_bellesip_EXTRA_CFLAGS}")
 
 # srtp
 set(EP_srtp_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_srtp_CMAKE_OPTIONS}")

configs/config-default.cmake

@@ -37,6 +37,7 @@ set(LINPHONE_BUILDER_BUILDERS
 # cunit
 set(EP_cunit_GIT_REPOSITORY "git://git.linphone.org/cunit.git")
 set(EP_cunit_GIT_TAG "linphone")
+set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=0 -DENABLE_CONSOLE=0")
 
 # xml2
 set(EP_xml2_GIT_REPOSITORY "git://git.gnome.org/libxml2")

configs/config-desktop.cmake

@@ -24,7 +24,7 @@ set(AUTOTOOLS_SHARED_LIBRARIES "--disable-static --enable-shared")
 set(CMAKE_SHARED_LIBRARIES "-DENABLE_STATIC=0")
 
 # cunit
-set(EP_cunit_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES}")
+set(EP_cunit_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_cunit_CMAKE_OPTIONS} -DENABLE_CURSES=1")
 
 # xml2
 set(EP_xml2_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_xml2_CONFIGURE_OPTIONS}")
@@ -33,7 +33,7 @@ set(EP_xml2_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_xml2_CONFIGURE
 set(EP_antlr3c_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_antlr3c_CMAKE_OPTIONS}")
 
 # polarssl
-set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1")
+set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1 ${EP_polarssl_CMAKE_OPTIONS}")
 
 # bellesip
 set(EP_bellesip_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_bellesip_CONFIGURE_OPTIONS}")