diff options
| author |   Oliver Freyermuth <o.freyermuth@googlemail.com> | 2014-07-26 21:21:38 +0200 |
|---|---|---|
| committer | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2014-07-26 21:21:38 +0200 |
| commit | f1b0a762af6495064c802db4c47fd46e3e77252f (patch) | |
| tree | a6d270584d6d10941cf408ca369b0187efeba90f /sci-physics | |
| parent | Merge github.com:gentoo-science/sci (diff) | |
| download | sci-f1b0a762af6495064c802db4c47fd46e3e77252f.tar.gz sci-f1b0a762af6495064c802db4c47fd46e3e77252f.tar.bz2 sci-f1b0a762af6495064c802db4c47fd46e3e77252f.zip | |
Fix doxygen-generation, adapt to now working way to run the test-suite (patched upstream).
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/geant-vmc/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-physics/geant-vmc/geant-vmc-9999.ebuild | 19 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sci-physics/geant-vmc/ChangeLog b/sci-physics/geant-vmc/ChangeLog index 807b464c9..1a52d9e24 100644 --- a/sci-physics/geant-vmc/ChangeLog +++ b/sci-physics/geant-vmc/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jul 2014; Oliver Freyermuth <o.freyermuth@googlemail.com> + geant-vmc-9999.ebuild: + Fix doxygen-generation, adapt to now working way to run the test-suite + (patched upstream). + *geant-vmc-9999 (06 Jul 2014) 06 Jul 2014; Oliver Freyermuth <o.freyermuth@googlemail.com> diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild index fa8fa5592..f0a1ebe86 100644 --- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild +++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html" LICENSE="GPL-2" SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm" +IUSE="doc examples geant3 +g4root +mtroot vgm test" RDEPEND=" sci-physics/root:= @@ -35,6 +35,7 @@ src_configure() { $(cmake-utils_use geant3 Geant4VMC_USE_GEANT4_G3TOG4) $(cmake-utils_use g4root Geant4VMC_USE_G4Root) $(cmake-utils_use mtroot Geant4VMC_USE_MTRoot) + $(cmake-utils_use test Geant4VMC_BUILD_EXAMPLES) $(cmake-utils_use examples Geant4VMC_INSTALL_EXAMPLES) ) cmake-utils_src_configure @@ -42,7 +43,7 @@ src_configure() { src_compile() { cmake-utils_src_compile - local dirs="g4root mtroot source" + local dirs="source" use g4root && dirs+=" g4root " use mtroot && dirs+=" mtroot " use examples && dirs+=" examples " @@ -58,18 +59,8 @@ src_compile() { src_test() { cd examples || die - local origDir=${CMAKE_USE_DIR} - CMAKE_USE_DIR=${CMAKE_USE_DIR}/examples - CMAKE_IN_SOURCE_BUILD=1 - CMAKE_MODULE_PATH=../cmake - local mycmakeargs=( - -DCMAKE_MODULE_PATH=${origDir}/cmake - ) - cmake-utils_src_configure - cmake-utils_src_compile - ./run_suite.sh || die - CMAKE_IN_SOURCE_BUILD=0 - CMAKE_USE_DIR=$origDir + ./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die + ./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die } src_install() { |