Commit 6d854372 authored by Konstantin Pavlov's avatar Konstantin Pavlov

contrib: openjpeg: added patch to fix install.

While at it, use upstream-preferred cmake parameters.
parent facf4da2
From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 9 Oct 2017 11:40:43 +0200
Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
static-only build lacks the installation target for the library (#1019, fixes
regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
---
src/lib/openjp2/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 0b4520384..f8990ccf0 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -99,6 +99,7 @@ else()
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
else()
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
endif()
endif()
...@@ -15,12 +15,13 @@ ifdef HAVE_VISUALSTUDIO ...@@ -15,12 +15,13 @@ ifdef HAVE_VISUALSTUDIO
# $(APPLY) $(SRC)/openjpeg/msvc.patch # $(APPLY) $(SRC)/openjpeg/msvc.patch
endif endif
# $(APPLY) $(SRC)/openjpeg/restrict.patch # $(APPLY) $(SRC)/openjpeg/restrict.patch
$(APPLY) $(SRC)/openjpeg/install.patch
$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in") $(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
$(MOVE) $(MOVE)
.openjpeg: openjpeg .openjpeg: openjpeg
cd $< && $(HOSTVARS) $(CMAKE) \ cd $< && $(HOSTVARS) $(CMAKE) \
-DBUILD_SHARED_LIBS=OFF -DBUILD_PKGCONFIG_FILES=ON \ -DBUILD_SHARED_LIBS:bool=off -DBUILD_PKGCONFIG_FILES=ON -DCMAKE_BUILD_TYPE=Release \
. .
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment