Package 'openjpeg': set INSTALL_NAME_DIR on MacOS for old versions. (#6603)
This commit is contained in:
parent
1bdea98978
commit
bd92cc0a1a
13
var/spack/repos/builtin/packages/openjpeg/macos.patch
Normal file
13
var/spack/repos/builtin/packages/openjpeg/macos.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -151,6 +151,10 @@ IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
|
SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
|
||||||
|
ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
|
|
||||||
|
+IF(APPLE)
|
||||||
|
+ LIST(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
|
||||||
|
+ENDIF()
|
||||||
|
+
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# Big endian test:
|
||||||
|
INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
|
@ -49,6 +49,11 @@ class Openjpeg(CMakePackage):
|
|||||||
version('1.5.2', '545f98923430369a6b046ef3632ef95c')
|
version('1.5.2', '545f98923430369a6b046ef3632ef95c')
|
||||||
version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e')
|
version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e')
|
||||||
|
|
||||||
|
# The problem with install name of the library on MacOs was fixed starting
|
||||||
|
# version 2.1.1: https://github.com/uclouvain/openjpeg/commit/b9a247b559e62e55f5561624cf4a19aee3c8afdc
|
||||||
|
# The solution works for the older versions (at least starting 1.5.1) too.
|
||||||
|
patch('macos.patch', when='@:2.1.0 platform=darwin')
|
||||||
|
|
||||||
def url_for_version(self, version):
|
def url_for_version(self, version):
|
||||||
if version >= Version('2.1.1'):
|
if version >= Version('2.1.1'):
|
||||||
return super(Openjpeg, self).url_for_version(version)
|
return super(Openjpeg, self).url_for_version(version)
|
||||||
|
Loading…
Reference in New Issue
Block a user