[vlc-commits] contribs: openjpeg: create pkg-config file when requested.

Konstantin Pavlov git at videolan.org
Fri Dec 8 09:16:41 CET 2017


vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Fri Dec  8 11:12:03 2017 +0300| [464446e611ef96d461a032ae81df61ce1ccf72bb] | committer: Konstantin Pavlov

contribs: openjpeg: create pkg-config file when requested.

UNIX is just a default, and when we force BUILD_PKGCONFIG_FILES we
expect the file to be created even on a non-UNIX systems (e.g. mingw).

(cherry picked from commit 49cc9197f151859555964da2f3fe6aece8e5cdf3)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=464446e611ef96d461a032ae81df61ce1ccf72bb
---

 contrib/src/openjpeg/openjp2_pthread.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/openjpeg/openjp2_pthread.patch b/contrib/src/openjpeg/openjp2_pthread.patch
index 2065f58dae..607b60883c 100644
--- a/contrib/src/openjpeg/openjp2_pthread.patch
+++ b/contrib/src/openjpeg/openjp2_pthread.patch
@@ -22,10 +22,10 @@
      endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
  endif(BUILD_UNIT_TESTS)
 +
-+if(UNIX)
++if(BUILD_PKGCONFIG_FILES)
 +    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libopenjp2.pc.cmake.in
 +                   ${PROJECT_BINARY_DIR}/libopenjp2.pc @ONLY)
-+endif(UNIX)
++endif(BUILD_PKGCONFIG_FILES)
 --- openjpeg/CMakeLists.txt.ORIG	2017-10-04 18:23:14.000000000 -0400
 +++ openjpeg/CMakeLists.txt	2017-12-05 19:43:35.573788173 -0500
 @@ -359,8 +359,6 @@



More information about the vlc-commits mailing list