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

proj: correct CMake arg for shared build with proj older than 7.0.0 (#43089)

Browse Source 
* proj: correct CMake arg for shared build with proj older than 7.0.0

* Actually use new CMake arg

* Update var/spack/repos/builtin/packages/proj/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

---------

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
John W. Parent
2024-03-09 02:40:27 -05:00
committed by GitHub
parent 14209a86a6
commit bf14b424bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/proj/package.py
View File

@@ -128,10 +128,11 @@ def install_datum_grids(self):
class CMakeBuilder(BaseBuilder, cmake.CMakeBuilder): class CMakeBuilder(BaseBuilder, cmake.CMakeBuilder):
def cmake_args(self): def cmake_args(self):
shared_arg = "BUILD_SHARED_LIBS" if self.spec.satisfies("@7:") else "BUILD_LIBPROJ_SHARED"
args = [ args = [
self.define_from_variant("ENABLE_TIFF", "tiff"), self.define_from_variant("ENABLE_TIFF", "tiff"),
self.define_from_variant("ENABLE_CURL", "curl"), self.define_from_variant("ENABLE_CURL", "curl"),
self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant(shared_arg, "shared"),
self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"),
] ]
if self.spec.satisfies("@6:") and self.pkg.run_tests: if self.spec.satisfies("@6:") and self.pkg.run_tests: