diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-13 21:03:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-13 21:03:07 +0100 |
commit | 8fbd420dce8836e6503b162092e07b6a77a89f1d (patch) | |
tree | 071c621ef44d7c1b24a430ac7671d68963b5a4cf /media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | |
parent | 12d78242dec4f785d0a0bfb1c00eee2d8996c53b (diff) |
gentoo resync : 13.10.2017
Diffstat (limited to 'media-gfx/exiv2/files/exiv2-0.26-cmake3.patch')
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch deleted file mode 100644 index 7a78d1c8bd86..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8af901ce05aeeaa4f5033da99670091f857d5931 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Sat, 3 Jun 2017 18:25:05 +0200 -Subject: [PATCH] cmake: always depend on threads, not only in the xmp case - ---- - CMakeLists.txt | 1 - - config/CMakeChecks.txt | 2 ++ - src/CMakeLists.txt | 2 ++ - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7034bb67..64604c6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP ) - IF (NOT MINGW) - set(THREADS_PREFER_PTHREAD_FLAG ON) - ENDIF() -- find_package(Threads REQUIRED) - ENDIF( EXIV2_ENABLE_XMP ) - - INCLUDE( config/CMakeChecks.txt ) -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index f7621a92..0dfe96b7 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -51,6 +51,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_C - LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) - SET( CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ) - -+find_package(Threads REQUIRED) -+ - IF( EXIV2_ENABLE_PNG ) - FIND_PACKAGE( ZLIB REQUIRED ) - INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e2904c6f..dcfb37e1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -268,10 +268,12 @@ else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} ) - else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} ) - endif() - endif() - |