| [proaudio] Mixxx-2.0.0 and 9999 ebuild Updates |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
- To: proaudio@xxxxxxxxxxxxxxxxxxx
- Subject: [proaudio] Mixxx-2.0.0 and 9999 ebuild Updates
- From: Alex Barker <alex@xxxxxxxxxx>
- Date: Mon, 11 Jan 2016 21:22:22 -0800
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1stleg-com.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-type; bh=ufz3CuCWCKKg3lFQdmjd1jlsemSMtJ39vWbC5+svxNs=; b=trrwmpaHnbqROyOKuvyYFPGHaVXum9dA6MEhbtrCd/2UpBsv157knWS8zapX6t8rmm DhM1n1WPob8Ojdi1R43yHHjdHG97o+iCn2VdahWhgw0hAsJLGjjq4VV71h/rMCmPNVU8 T3ls6EyxvUDz1a/uFnO7Qdy/C0RARKOGdHi2EynUC3coKKmJebbritrFc351gRNybUrO tZPTBHrYxi903b9iXaJbCPjlCa4AhxRCoZWd5q7mIQ8EK5KFcqGPtHslB9cC72gEteUK kmLzSu45kzyko2Qn7Cmc8JP/CHmFM7oSsIoRopb6EEw1VGztX9NFm+tPtflZ6HCi+2E8 GYBQ==
Sorry about neglecting the mixxx ebuilds, my hard drive crashed at the
same time as plasma 5 crash landed so its taken me until now to get my
system in a stable state. Attached are mixxx ebuild updates for the
trunk and mixxx 2.0 as well as the related patches.
Best,
Alex
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
inherit eutils multilib scons-utils toolchain-funcs
DESCRIPTION="A Qt based Digital DJ tool"
HOMEPAGE="http://www.mixxx.org/";
SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="aac debug doc hid mp3 mp4 pulseaudio qt4 qt5 shout wavpack"
REQUIRED_USE="^^ ( qt4 qt5 )"
RDEPEND="dev-libs/protobuf
media-libs/chromaprint
>media-libs/fidlib-0.9.10-r1
media-libs/flac
media-libs/libid3tag
media-libs/libogg
media-libs/libsndfile
>=media-libs/libsoundtouch-1.5
media-libs/libvorbis
>=media-libs/portaudio-19_pre
media-libs/portmidi
media-libs/rubberband
media-libs/taglib
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0
virtual/glu
virtual/opengl
qt4? (
dev-qt/qtgui:4
dev-qt/qtopengl:4
dev-qt/qtsql:4
dev-qt/qtsvg:4
dev-qt/qttest:4
dev-qt/qtwebkit:4
dev-qt/qtxmlpatterns:4
)
qt5? (
>=dev-qt/qtscript-5.4.2:5[scripttools]
>=dev-qt/qtsvg-5.4.2:5
>=dev-qt/qtsql-5.4.2:5
>=dev-qt/qtxml-5.4.2:5
>=dev-qt/qtopengl-5.4.2:5
>=dev-qt/qtgui-5.4.2:5
>=dev-qt/qtnetwork-5.4.2:5
>=dev-qt/qtcore-5.4.2:5
>=dev-qt/qtwidgets-5.4.2:5
>=dev-qt/qttest-5.4.2:5
>=dev-qt/qtxmlpatterns-5.4.2:5
>=dev-qt/qtconcurrent-5.4.2:5
)
aac? (
media-libs/faad2
media-libs/libmp4v2:0
)
hid? ( dev-libs/hidapi )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
pulseaudio? ( media-sound/pulseaudio )
shout? ( media-libs/libshout )
wavpack? ( media-sound/wavpack )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
# alter startup command when pulseaudio support is disabled
if ! use pulseaudio ; then
sed -i -e 's:pasuspender ::' res/linux/mixxx.desktop || die
fi
}
src_configure() {
myesconsargs=(
prefix="${EPREFIX}/usr"
qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
hifieq=1
vinylcontrol=1
optimize=0
$(use_scons aac faad)
$(use_scons debug qdebug)
$(use_scons hid hid)
$(use_scons mp3 mad)
$(use_scons mp4 m4a)
$(use_scons shout shoutcast)
$(use_scons wavpack wv)
)
}
src_compile() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons
}
src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons \
install_root="${ED}"/usr install
dodoc README Mixxx-Manual.pdf
}
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
inherit eutils git-2 multilib scons-utils toolchain-funcs
DESCRIPTION="A Qt based Digital DJ tool"
HOMEPAGE="http://www.mixxx.org/";
EGIT_REPO_URI="git://github.com/mixxxdj/${PN}.git"
EGIT_BRANCH="master"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="aac debug doc hid mp3 mp4 pulseaudio qt4 qt5 shout wavpack"
REQUIRED_USE="^^ ( qt4 qt5 )"
RDEPEND="dev-libs/protobuf
media-libs/chromaprint
>media-libs/fidlib-0.9.10-r1
media-libs/flac
media-libs/libid3tag
media-libs/libogg
media-libs/libsndfile
>=media-libs/libsoundtouch-1.5
media-libs/libvorbis
>=media-libs/portaudio-19_pre
media-libs/portmidi
media-libs/rubberband
media-libs/taglib
media-libs/vamp-plugin-sdk
sci-libs/fftw:3.0
virtual/glu
virtual/opengl
qt4? (
dev-qt/qtgui:4
dev-qt/qtopengl:4
dev-qt/qtsql:4
dev-qt/qtsvg:4
dev-qt/qttest:4
dev-qt/qtwebkit:4
dev-qt/qtxmlpatterns:4
)
qt5? (
>=dev-qt/qtscript-5.4.2:5[scripttools]
>=dev-qt/qtsvg-5.4.2:5
>=dev-qt/qtsql-5.4.2:5
>=dev-qt/qtxml-5.4.2:5
>=dev-qt/qtopengl-5.4.2:5
>=dev-qt/qtgui-5.4.2:5
>=dev-qt/qtnetwork-5.4.2:5
>=dev-qt/qtcore-5.4.2:5
>=dev-qt/qtwidgets-5.4.2:5
>=dev-qt/qttest-5.4.2:5
>=dev-qt/qtxmlpatterns-5.4.2:5
>=dev-qt/qtconcurrent-5.4.2:5
)
aac? (
media-libs/faad2
media-libs/libmp4v2:0
)
hid? ( dev-libs/hidapi )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
pulseaudio? ( media-sound/pulseaudio )
shout? ( media-libs/libshout )
wavpack? ( media-sound/wavpack )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S=${S}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
# alter startup command when pulseaudio support is disabled
if ! use pulseaudio ; then
sed -i -e 's:pasuspender ::' res/linux/mixxx.desktop || die
fi
}
src_configure() {
myesconsargs=(
prefix="${EPREFIX}/usr"
qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
hifieq=1
vinylcontrol=1
optimize=0
$(use_scons aac faad)
$(use_scons debug qdebug)
$(use_scons hid hid)
$(use_scons mp3 mad)
$(use_scons mp4 m4a)
$(use_scons shout shoutcast)
$(use_scons wavpack wv)
)
}
src_compile() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons
}
src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons install \
install_root="${ED}"/usr
dodoc README Mixxx-Manual.pdf
}
--- mixxx-9999/src/SConscript
+++ mixxx-9999/src/SConscript
@@ -290,7 +290,6 @@
env.Alias('install', controllermappings)
env.Alias('install', translations)
env.Alias('install', keyboardmappings)
- env.Alias('install', docs)
env.Alias('install', dotdesktop)
env.Alias('install', icon)
env.Alias('install', promotracks)
diff -Naur mixxx-2.0.0/build/depends.py mixxx-2.0.0_patch/build/depends.py
--- mixxx-2.0.0/build/depends.py 2015-12-29 08:10:41.000000000 -0800
+++ mixxx-2.0.0_patch/build/depends.py 2016-01-11 20:23:40.641866196 -0800
@@ -369,25 +369,10 @@
class FidLib(Dependence):
- def sources(self, build):
- symbol = None
- if build.platform_is_windows:
- if build.toolchain_is_msvs:
- symbol = 'T_MSVC'
- elif build.crosscompile:
- # Not sure why, but fidlib won't build with mingw32msvc and
- # T_MINGW
- symbol = 'T_LINUX'
- elif build.toolchain_is_gnu:
- symbol = 'T_MINGW'
- else:
- symbol = 'T_LINUX'
-
- return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
- CPPDEFINES=symbol)]
-
def configure(self, build, conf):
- build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
+ if not conf.CheckLib('fidlib'):
+ raise Exception('Did not find fidlib library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
class ReplayGain(Dependence):
@@ -400,42 +385,17 @@
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
- return ['engine/enginebufferscalest.cpp',
- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
- # SoundTouch CPU optimizations are only for x86
- # architectures. SoundTouch automatically ignores these files
- # when it is not being built for an architecture that supports
- # them.
- '#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
+ return ['engine/enginebufferscalest.cpp']
def configure(self, build, conf, env=None):
if env is None:
env = build.env
- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-
- # Prevents circular import.
- from features import Optimize
-
- # If we do not want optimizations then disable them.
- optimize = (build.flags['optimize'] if 'optimize' in build.flags
- else Optimize.get_optimization_level(build))
- if optimize == Optimize.LEVEL_OFF:
- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
+ if not conf.CheckLib(['SoundTouch','libSoundTouch']):
+ raise Exception('Did not find SoundTouch library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
+ build.env.Append(LIBS='SoundTouch')
class RubberBand(Dependence):
diff -Naur mixxx-2.0.0/build/features.py mixxx-2.0.0_patch/build/features.py
--- mixxx-2.0.0/build/features.py 2015-12-29 08:10:41.000000000 -0800
+++ mixxx-2.0.0_patch/build/features.py 2016-01-11 20:27:05.342990424 -0800
@@ -62,10 +62,6 @@
def configure(self, build, conf):
if not self.enabled(build):
return
- # TODO(XXX) allow external hidapi install, but for now we just use our
- # internal one.
- build.env.Append(
- CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
if build.platform_is_linux:
build.env.ParseConfig(
@@ -90,23 +86,17 @@
build.env.Append(CPPDEFINES='__HID__')
+ if not conf.CheckLib('hidapi-libusb'):
+ raise Exception('Did not find HID API library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
+ build.env.Append(LIBS='hidapi-libusb')
+
+
def sources(self, build):
sources = ['controllers/hid/hidcontroller.cpp',
'controllers/hid/hidenumerator.cpp',
'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- if build.platform_is_windows:
- # Requires setupapi.lib which is included by the above check for
- # setupapi.
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
- elif build.platform_is_linux:
- # hidapi compiles the libusb implementation by default on Linux
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
- elif build.platform_is_osx:
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
return sources
@@ -745,24 +735,15 @@
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')
- test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
- gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
- # gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
- # build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example,
- # optional
- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.7.0/lib'
-
- env = test_env
- SCons.Export('env')
- env.SConscript(env.File('SConscript', gtest_dir))
-
- # build and configure gmock
- test_env.Append(CPPPATH="#lib/gmock-1.7.0/include")
- gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
- # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
-
- env.SConscript(env.File('SConscript', gmock_dir))
+ if not conf.CheckLib('gtest'):
+ raise Exception('Did not find gtest library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
+ test_env.Append(LIBS='gtest')
+
+ if not conf.CheckLib('gmock'):
+ raise Exception('Did not find gmock library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
+ test_env.Append(LIBS='gmock')
return []
--- mixxx-9999/src/SConscript
+++ mixxx-9999/src/SConscript
@@ -290,7 +290,6 @@
env.Alias('install', controllermappings)
env.Alias('install', translations)
env.Alias('install', keyboardmappings)
- env.Alias('install', docs)
env.Alias('install', dotdesktop)
env.Alias('install', icon)
env.Alias('install', promotracks)
diff --git a/build/depends.py b/build/depends.py
index aa8ada3..70e9130 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -374,25 +374,10 @@ class TestHeaders(Dependence):
class FidLib(Dependence):
- def sources(self, build):
- symbol = None
- if build.platform_is_windows:
- if build.toolchain_is_msvs:
- symbol = 'T_MSVC'
- elif build.crosscompile:
- # Not sure why, but fidlib won't build with mingw32msvc and
- # T_MINGW
- symbol = 'T_LINUX'
- elif build.toolchain_is_gnu:
- symbol = 'T_MINGW'
- else:
- symbol = 'T_LINUX'
-
- return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
- CPPDEFINES=symbol)]
-
def configure(self, build, conf):
- build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
+ if not conf.CheckLib('fidlib'):
+ raise Exception('Did not find fidlib library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
class ReplayGain(Dependence):
@@ -405,42 +390,17 @@ class ReplayGain(Dependence):
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
- return ['engine/enginebufferscalest.cpp',
- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
- # SoundTouch CPU optimizations are only for x86
- # architectures. SoundTouch automatically ignores these files
- # when it is not being built for an architecture that supports
- # them.
- '#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
+ return ['engine/enginebufferscalest.cpp']
def configure(self, build, conf, env=None):
if env is None:
env = build.env
- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-
- # Prevents circular import.
- from features import Optimize
-
- # If we do not want optimizations then disable them.
- optimize = (build.flags['optimize'] if 'optimize' in build.flags
- else Optimize.get_optimization_level(build))
- if optimize == Optimize.LEVEL_OFF:
- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS')
+ if not conf.CheckLib(['SoundTouch','libSoundTouch']):
+ raise Exception('Did not find SoundTouch library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
+ build.env.Append(LIBS='SoundTouch')
class RubberBand(Dependence):
diff --git a/build/features.py b/build/features.py
index 531e1a4..bc54fad 100644
--- a/build/features.py
+++ b/build/features.py
@@ -81,10 +81,6 @@ class HID(Feature):
def configure(self, build, conf):
if not self.enabled(build):
return
- # TODO(XXX) allow external hidapi install, but for now we just use our
- # internal one.
- build.env.Append(
- CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
if build.platform_is_linux:
build.env.ParseConfig(
@@ -109,24 +105,15 @@ class HID(Feature):
build.env.Append(CPPDEFINES='__HID__')
- def sources(self, build):
- sources = ['controllers/hid/hidcontroller.cpp',
- 'controllers/hid/hidenumerator.cpp',
- 'controllers/hid/hidcontrollerpresetfilehandler.cpp']
+ if not conf.CheckLib('hidapi-libusb'):
+ raise Exception('Did not find HID API library, exiting!')
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
+ build.env.Append(LIBS='hidapi-libusb')
- if build.platform_is_windows:
- # Requires setupapi.lib which is included by the above check for
- # setupapi.
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
- elif build.platform_is_linux:
- # hidapi compiles the libusb implementation by default on Linux
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
- elif build.platform_is_osx:
- sources.append(
- os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
- return sources
+ def sources(self, build):
+ return ['controllers/hid/hidcontroller.cpp',
+ 'controllers/hid/hidenumerator.cpp',
+ 'controllers/hid/hidcontrollerpresetfilehandler.cpp']
class Bulk(Feature):
@@ -768,25 +755,15 @@ class TestSuite(Feature):
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')
- test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
- gtest_dir = test_env.Dir("#lib/gtest-1.7.0")
- # gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
- # build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example,
- # optional
- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.7.0/lib'
-
- env = test_env
- SCons.Export('env')
- SCons.Export('build')
- env.SConscript(env.File('SConscript', gtest_dir))
-
- # build and configure gmock
- test_env.Append(CPPPATH="#lib/gmock-1.7.0/include")
- gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
- # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
-
- env.SConscript(env.File('SConscript', gmock_dir))
+ if not conf.CheckLib('gtest'):
+ raise Exception('Did not find gtest library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
+ test_env.Append(LIBS='gtest')
+
+ if not conf.CheckLib('gmock'):
+ raise Exception('Did not find gmock library, exiting!')
+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
+ test_env.Append(LIBS='gmock')
# Build the benchmark library
test_env.Append(CPPPATH="#lib/benchmark/include")