zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add better generator support to CMakePackage (#4988)

Browse Source 
* Add better generator support to CMakePackage

* List valid CMake generators on error
This commit is contained in:
Adam J. Stewart
2017-08-16 12:25:37 -05:00
committed by GitHub
parent db657d938d
commit 11b3ce27b7
4 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/archer/package.py
View File

@@ -36,22 +36,14 @@ class Archer(CMakePackage):
depends_on('cmake@3.4.3:', type='build')
depends_on('llvm')
depends_on('ninja', type='build')
depends_on('ninja@1.5:', type='build')
depends_on('llvm-openmp-ompt')
generator = 'Ninja'
def cmake_args(self):
return [
'-G', 'Ninja',
'-DCMAKE_C_COMPILER=clang',
'-DCMAKE_CXX_COMPILER=clang++',
'-DOMP_PREFIX:PATH=%s' % self.spec['llvm-openmp-ompt'].prefix,
]
# TODO: Add better ninja support to CMakePackage
def build(self, spec, prefix):
with working_dir(self.build_directory):
ninja()
def install(self, spec, prefix):
with working_dir(self.build_directory):
ninja('install')

15
var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
View File

@@ -44,24 +44,15 @@ class LlvmOpenmpOmpt(CMakePackage):
depends_on('cmake@2.8:', type='build')
depends_on('llvm')
depends_on('ninja', type='build')
depends_on('ninja@1.5:', type='build')
generator = 'Ninja'
def cmake_args(self):
return [
'-G', 'Ninja',
'-DCMAKE_C_COMPILER=clang',
'-DCMAKE_CXX_COMPILER=clang++',
'-DCMAKE_BUILD_TYPE=Release',
'-DLIBOMP_OMPT_SUPPORT=on',
'-DLIBOMP_OMPT_BLAME=on',
'-DLIBOMP_OMPT_TRACE=on'
]
# TODO: Add better ninja support to CMakePackage
def build(self, spec, prefix):
with working_dir(self.build_directory):
ninja()
def install(self, spec, prefix):
with working_dir(self.build_directory):
ninja('install')