aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Legashov <denis.legashov@gmail.com>2018-09-25 13:48:07 +0300
committerDenis Legashov <denis.legashov@gmail.com>2018-09-25 13:48:07 +0300
commit8f0f1aa85faab4f671db03729b33792a0ed60807 (patch)
tree35e1a9349c5bf4e3f22fbc9cb98dc1581d1a643e
parent68a5eba2d183ffc710799e8cf1f2a927ca8e031f (diff)
downloadvcpkg-8f0f1aa85faab4f671db03729b33792a0ed60807.tar.gz
vcpkg-8f0f1aa85faab4f671db03729b33792a0ed60807.zip
Updated leptonica patch in order to fix Linux builds
-rw-r--r--ports/leptonica/fix-cmakelists.patch40
1 files changed, 9 insertions, 31 deletions
diff --git a/ports/leptonica/fix-cmakelists.patch b/ports/leptonica/fix-cmakelists.patch
index 18eb8cde5..b08a971f6 100644
--- a/ports/leptonica/fix-cmakelists.patch
+++ b/ports/leptonica/fix-cmakelists.patch
@@ -1,34 +1,12 @@
---- a/src/CMakeLists.txt Sun Jun 11 23:04:50 2017
-+++ b/src/CMakeLists.txt Wed Aug 16 17:29:56 2017
-@@ -27,24 +27,31 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 945100a..6daad98 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -14,7 +14,6 @@ if (MSVC)
+ set_source_files_properties(${src} PROPERTIES LANGUAGE CXX)
endif()
- if (GIF_LIBRARY)
-+ target_include_directories (leptonica PUBLIC ${GIF_INCLUDE_DIR})
- target_link_libraries (leptonica ${GIF_LIBRARY})
- endif()
- if (JPEG_LIBRARY)
-+ target_include_directories (leptonica PUBLIC ${JPEG_INCLUDE_DIR})
- target_link_libraries (leptonica ${JPEG_LIBRARY})
- endif()
- if (JP2K_FOUND)
-+ target_include_directories (leptonica PUBLIC ${JP2K_INCLUDE_DIR})
- target_link_libraries (leptonica ${JP2K_LIBRARIES})
- endif()
- if (PNG_LIBRARY)
-+ target_include_directories (leptonica PUBLIC ${PNG_INCLUDE_DIRS})
- target_link_libraries (leptonica ${PNG_LIBRARY})
- endif()
- if (TIFF_LIBRARY)
-+ target_include_directories (leptonica PUBLIC ${TIFF_INCLUDE_DIR})
- target_link_libraries (leptonica ${TIFF_LIBRARY})
- endif()
- if (WEBP_FOUND)
-+ target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIR})
- target_link_libraries (leptonica ${WEBP_LIBRARIES})
- endif()
- if (ZLIB_LIBRARY)
-+ target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIR})
- target_link_libraries (leptonica ${ZLIB_LIBRARY})
- endif()
+-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+ add_library (leptonica ${LIBRARY_TYPE} ${src} ${hdr})
+ set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN})