Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
2683189d
Commit
2683189d
authored
Feb 06, 2014
by
Ghislain MARY
Browse files
Use CMake to build CUnit.
parent
719245de
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
63 deletions
+7
-63
builders/cunit.cmake
builders/cunit.cmake
+1
-1
builders/cunit/build.sh.cmake
builders/cunit/build.sh.cmake
+0
-18
builders/cunit/configure.sh.cmake
builders/cunit/configure.sh.cmake
+0
-21
builders/cunit/install.sh.cmake
builders/cunit/install.sh.cmake
+0
-18
configs/config-bb10.cmake
configs/config-bb10.cmake
+3
-3
configs/config-default.cmake
configs/config-default.cmake
+1
-0
configs/config-desktop.cmake
configs/config-desktop.cmake
+2
-2
No files found.
builders/cunit.cmake
View file @
2683189d
...
...
@@ -20,4 +20,4 @@
#
############################################################################
linphone_builder_add_
autotools
_project
(
cunit
)
linphone_builder_add_
cmake
_project
(
cunit
)
builders/cunit/build.sh.cmake
deleted
100755 → 0
View file @
719245de
#!/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
deleted
100755 → 0
View file @
719245de
#!/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
deleted
100755 → 0
View file @
719245de
#!/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
View file @
2683189d
...
...
@@ -24,7 +24,7 @@ set(AUTOTOOLS_SHARED_LIBRARIES "--disable-static --enable-shared")
set
(
CMAKE_SHARED_LIBRARIES
"-DENABLE_STATIC=0"
)
# cunit
set
(
EP_cunit_C
ONFIGUR
E_OPTIONS
"
${
AUTOTOOLS
_SHARED_LIBRARIES
}
"
)
set
(
EP_cunit_C
MAK
E_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
View file @
2683189d
...
...
@@ -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
View file @
2683189d
...
...
@@ -24,7 +24,7 @@ set(AUTOTOOLS_SHARED_LIBRARIES "--disable-static --enable-shared")
set
(
CMAKE_SHARED_LIBRARIES
"-DENABLE_STATIC=0"
)
# cunit
set
(
EP_cunit_C
ONFIGUR
E_OPTIONS
"
${
AUTOTOOLS
_SHARED_LIBRARIES
}
"
)
set
(
EP_cunit_C
MAK
E_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
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment