From b7c9f94c004f1608c8cba2f1822c451f0828328e Mon Sep 17 00:00:00 2001 From: Hunter Allen Date: Sun, 7 Jan 2018 22:02:46 -0600 Subject: [PATCH] Add opencv3 check (#114) * Turn off cuda for opencv3 if GCC > 4. This also simplifies the logic for special cases. --- superflore/generators/ebuild/ebuild.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/superflore/generators/ebuild/ebuild.py b/superflore/generators/ebuild/ebuild.py index cdcb6416..07ed5090 100644 --- a/superflore/generators/ebuild/ebuild.py +++ b/superflore/generators/ebuild/ebuild.py @@ -184,14 +184,22 @@ def get_ebuild_text(self, distributor, license_text): ret += " ros-cmake_src_prepare\n" ret += "}\n" - special_pkgs = ['opencv3', 'stage'] # source configuration - if self.name in special_pkgs: + if self.name == 'opencv3': ret += "\nsrc_configure() {\n" - if self.name == 'opencv3': - ret += " filter-flags '-march=*' '-mcpu=*' '-mtune=*'\n" - elif self.name == 'stage': - ret += " filter-flags '-std=*'\n" + ret += " filter-flags '-march=*' '-mcpu=*' '-mtune=*'\n" + ret += " if [[ $(gcc-major-version) -gt 4 ]]; then\n" + ret += " local mycmakeargs=(\n" + ret += " -DWITH_CUDA=OFF\n" + ret += " )\n" + ret += ' ewarn "Cuda does not support GCC > 4, so cuda' + ret += ' has been disabled."\n' + ret += " fi\n" + ret += " ros-cmake_src_configure\n" + ret += "}\n" + elif self.name == 'stage': + ret += "\nsrc_configure() {\n" + ret += " filter-flags '-std=*'\n" ret += " ros-cmake_src_configure\n" ret += "}\n"