From fc8889c4ce2bcf5c39ea2e5f3607356357a68062 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Thu, 19 Aug 2010 00:45:29 +0200 Subject: Fix src_test usage (no need for separate configure phase for src_test since it won't work anyway) --- dev-cpp/eigen/Manifest | 2 +- dev-cpp/eigen/eigen-9999.ebuild | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) (limited to 'dev-cpp/eigen') diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest index 63164dfefc2..b1a9574a8b7 100644 --- a/dev-cpp/eigen/Manifest +++ b/dev-cpp/eigen/Manifest @@ -1,2 +1,2 @@ -EBUILD eigen-9999.ebuild 1504 RMD160 3b4d34f92e5d903816da51c150880f3b8427e9ad SHA1 106adb6031d3e7464b821e860e7019934169d2ae SHA256 2222816f2ec1276d974b30c137393dd2bf0b1e1e18cdc4f70decc5ba03311ec7 +EBUILD eigen-9999.ebuild 1341 RMD160 75b6c1227ba8bd89f8f015e65ef3bc5ecb11fe15 SHA1 455a26f53871059b59651999c53095338008ab50 SHA256 dbd15f7a5e5347ed7500f6dc6f032a3f5d1e6ecc94fb643d1738f60c67186e7b MISC metadata.xml 620 RMD160 5e24e438e3a9501381b1cab57dcaf29f8cff8374 SHA1 419bbd39ba071fb7ed3588903419ceadf9833a36 SHA256 35dc30130eccec1771de4dd1392b86fc2d6451bcac10babb0ccf5a5e71aad593 diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild index 89212799b5f..a77118c5c58 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -14,7 +14,7 @@ EHG_REPO_URI="https://bitbucket.org/eigen/eigen" LICENSE="GPL-3" KEYWORDS="" SLOT="3" -IUSE="debug doc examples" +IUSE="debug doc examples test" RDEPEND=" examples? ( @@ -36,34 +36,21 @@ src_configure() { -DEIGEN_BUILD_LIB=OFF -DEIGEN_BUILD_BTL=OFF $(cmake-utils_use examples EIGEN_BUILD_DEMOS) + $(cmake-utils_use test EIGEN_BUILD_TESTS) + $(cmake-utils_use test EIGEN_TEST_NO_FORTRAN) ) cmake-utils_src_configure } src_compile() { cmake-utils_src_compile - if use doc; then - cd "${CMAKE_BUILD_DIR}" - emake doc || die "building documentation failed" - fi -} - -src_test() { - mycmakeargs+=( - -DEIGEN_BUILD_TESTS=ON - -DEIGEN_TEST_NO_FORTRAN=ON - ) - cmake-utils_src_configure - cmake-utils_src_compile - cmake-utils_src_test + use doc && cmake-utils_src_compile doc } src_install() { + use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/doc/html/") cmake-utils_src_install - if use doc; then - cd "${CMAKE_BUILD_DIR}"/doc - dohtml -r html/* || die "dohtml failed" - fi + if use examples; then cd "${CMAKE_BUILD_DIR}"/demos dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed" -- cgit v1.2.3