From 7e3a11b46a9604bc5e495ec34c60b9e69e6347d6 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 30 May 2017 21:55:50 +0200 Subject: ISAAC: Fix CMakeLists.txt Path (#4374) Somehow the path to `CMakeLists.txt` via the class property `root_cmakelists_dir` was relative but is now actually relative to `spack-build/`. Close 4324 by providing a path relative to the source repo of the stage via a method instead of a member variable --- var/spack/repos/builtin/packages/isaac-server/package.py | 4 +++- var/spack/repos/builtin/packages/isaac/package.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index b9954b0a17..8e345b1ea2 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -31,7 +31,9 @@ class IsaacServer(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" - root_cmakelists_dir = 'server' + @property + def root_cmakelists_dir(self): + return join_path(self.stage.source_path, 'server') version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/isaac.git') diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index fd3b979985..390006174e 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -31,7 +31,9 @@ class Isaac(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" - root_cmakelists_dir = 'lib' + @property + def root_cmakelists_dir(self): + return join_path(self.stage.source_path, 'lib') version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/isaac.git') -- cgit v1.2.3-70-g09d2