aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Woods <pete.woods@canonical.com>2013-08-19 18:01:44 +0100
committerPete Woods <pete.woods@canonical.com>2013-08-19 18:01:44 +0100
commit7e63d1c240a6b1e07275189d0af05edd1adbc654 (patch)
treeb9eb225618ee4be1adf81bbf65de091ce53d16d0
parentbe867b88006520083a148785e8db761730b85eff (diff)
downloadayatana-indicator-sound-7e63d1c240a6b1e07275189d0af05edd1adbc654.tar.gz
ayatana-indicator-sound-7e63d1c240a6b1e07275189d0af05edd1adbc654.tar.bz2
ayatana-indicator-sound-7e63d1c240a6b1e07275189d0af05edd1adbc654.zip
Address review comments
-rw-r--r--CMakeLists.txt5
-rwxr-xr-xbuild.sh69
2 files changed, 4 insertions, 70 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1f1a1a..98dccef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,6 @@ pkg_check_modules(
gio-2.0>=${GIO_2_0_REQUIRED_VERSION}
gio-unix-2.0
libxml-2.0
- gthread-2.0
)
include_directories(${SOUNDSERVICE_INCLUDE_DIRS})
@@ -53,6 +52,10 @@ include_directories(${SOURCE_BINARY_DIR})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+add_definitions(
+ -Wall
+)
+
configure_file(
"config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/config.h"
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 1a15125..0000000
--- a/build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/bash
-set -e
-
-ECLIPSE=false
-CLEAN=false
-SOURCEDIR="$PWD"
-BRANCHNAME=`basename $SOURCEDIR`
-BUILDDIR="$SOURCEDIR/../$BRANCHNAME-build"
-
-usage() {
- echo "usage: $0 [OPTIONS] [BUILD_TYPE]\n" >&2
- echo "Script to build indicator-sound. If BUILD_TYPE is not specified, it defaults to \"Debug\".\n" >&2
- echo "OPTIONS:" >&2
- echo " -e, --eclipse Generate Eclipse projects" >&2
- echo " -c, --clean Clean the build tree before building" >&2
- echo >&2
- exit 1
-}
-
-ARGS=`getopt -n$0 -u -a --longoptions="eclipse,clean,help" -o "sch" -- "$@"`
-[ $? -ne 0 ] && usage
-eval set -- "$ARGS"
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -e|--eclipse) ECLIPSE=true;;
- -c|--clean) CLEAN=true;;
- -h|--help) usage;;
- --) shift;break;;
- esac
- shift
-done
-
-[ $# -gt 1 ] && usage
-
-BUILD_TYPE="Debug"
-[ $# -eq 1 ] && BUILD_TYPE="$1"
-
-if [ -f "/usr/bin/ninja" ] ; then
- if $ECLIPSE; then
- GENERATOR="Eclipse CDT4 - Ninja"
- else
- GENERATOR="Ninja"
- fi
- BUILD_COMMAND="ninja"
-else
- if $ECLIPSE; then
- GENERATOR="Eclipse CDT4 - Unix Makefiles"
- else
- GENERATOR="Unix Makefiles"
- fi
- BUILD_COMMAND="make"
-fi
-
-echo "Using $BUILD_COMMAND to build"
-
-if $CLEAN; then
- rm -rf $BUILDDIR
-fi
-
-mkdir -p $BUILDDIR
-(
- cd $BUILDDIR
- cmake "$SOURCEDIR" -G "$GENERATOR" \
- -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
- -DCMAKE_INSTALL_PREFIX="$SOURCEDIR/../$BRANCHNAME-install"
- $BUILD_COMMAND
-)