Improve caffe dependency detection with extra CMake flags (#5328)
* Improve caffe dependency detection with extra CMake flags * lmdb and leveldb fix
This commit is contained in:
		
				
					committed by
					
						
						Todd Gamblin
					
				
			
			
				
	
			
			
			
						parent
						
							e0fa335df0
						
					
				
				
					commit
					b14b02f875
				
			@@ -1,5 +1,5 @@
 | 
			
		||||
##############################################################################
 | 
			
		||||
# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
 | 
			
		||||
# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
 | 
			
		||||
# Produced at the Lawrence Livermore National Laboratory.
 | 
			
		||||
#
 | 
			
		||||
# This file is part of Spack.
 | 
			
		||||
@@ -82,7 +82,19 @@ def cmake_args(self):
 | 
			
		||||
                '-DBUILD_matlab=%s' % ('+matlab' in spec),
 | 
			
		||||
                '-DUSE_OPENCV=%s' % ('+opencv' in spec),
 | 
			
		||||
                '-DUSE_LEVELDB=%s' % ('+leveldb' in spec),
 | 
			
		||||
                '-DUSE_LMDB=%s' % ('+lmdb' in spec)]
 | 
			
		||||
                '-DUSE_LMDB=%s' % ('+lmdb' in spec),
 | 
			
		||||
                '-DGFLAGS_ROOT_DIR=%s' % spec['gflags'].prefix,
 | 
			
		||||
                '-DGLOG_ROOT_DIR=%s' % spec['glog'].prefix,
 | 
			
		||||
                ]
 | 
			
		||||
 | 
			
		||||
        if spec.satisfies('^openblas'):
 | 
			
		||||
            env['OpenBLAS_HOME'] = spec['openblas'].prefix
 | 
			
		||||
 | 
			
		||||
        if spec.satisfies('+lmdb'):
 | 
			
		||||
            env['LMDB_DIR'] = spec['lmdb'].prefix
 | 
			
		||||
 | 
			
		||||
        if spec.satisfies('+leveldb'):
 | 
			
		||||
            env['LEVELDB_ROOT'] = spec['leveldb'].prefix
 | 
			
		||||
 | 
			
		||||
        if spec.satisfies('+python'):
 | 
			
		||||
            version = spec['python'].version.up_to(1)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user