aboutsummaryrefslogtreecommitdiff
path: root/ports/tiff/cmakelists.patch
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-05-29 01:58:00 +0200
committerVictor Romero <romerosanchezv@gmail.com>2019-05-28 16:58:00 -0700
commita9303736fdda58cf5ff3ccc969be917580493c91 (patch)
treefab5304f58fa8017e982423ee59fbfd386a1dc62 /ports/tiff/cmakelists.patch
parent3d4b4c02ede7b343f4cd9cdfebbd3124ad834045 (diff)
downloadvcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.tar.gz
vcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.zip
[LibLZMA] automatic configuration (#6000)
* [LibLZMA] add a config-generated by CMake * bump control files of LibLZMA and dependent ports * [tiff] use proper liblzma target [OpenCV] add an explicit dependency on LibLZMA for static linking * [liblzma] fix header install path * [LibLZMA] avoid using targets in old symbols * fixes for windows-static and trying to see if CI is happier with a share/lib folder written in lowercase * [LibLZMA] use only modern CMake language, remove patch in favour of target public definition * [lzma] put symbols in cmake cache * [libxmlpp] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS regression * [lzma] fix header install path * [liblzma] install wrapper to force config mode * [liblzma] remove function check inside cmake config since we know it will pass * [liblzma] wrapper fix * [tiff,geotiff] general cleanup and patch fixes * [libgeotiff] remove debug tools * [tesseract] modernize * [tiff] fix also tiff_library symbol * [pdal,libgeotiff] better library integration * [tiff] restore using unix i/o on UWP, since it was working... for sure win32 one cannot work * [tiff] enable lzma also on uwp, since it works and is requested by many dependencies * [selene] enable build on arm/arm64-windows, which was surely broken before * [lzma] uniform naming with cmake 3.14 * [podofo] fix regression, it requires openssl which was disabled in dependencies * [many ports] remove unnecessary mods * [boost-iostream] chmod * [openssl] fix regression due to missing architecture * [podofo] fix regression on uwp due to missing include * [libpq] explicitly fail on UWP, it should avoid being marked as regression * [shiva] fix regression on linux
Diffstat (limited to 'ports/tiff/cmakelists.patch')
-rw-r--r--ports/tiff/cmakelists.patch99
1 files changed, 99 insertions, 0 deletions
diff --git a/ports/tiff/cmakelists.patch b/ports/tiff/cmakelists.patch
new file mode 100644
index 000000000..597c980c5
--- /dev/null
+++ b/ports/tiff/cmakelists.patch
@@ -0,0 +1,99 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 845ddf0..9ccb9b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,9 +181,7 @@ foreach(flag ${test_flags})
+ endif (${test_c_flag})
+ endforeach(flag ${test_flags})
+
+-if(MSVC)
+- set(CMAKE_DEBUG_POSTFIX "d")
+-endif()
++set(CMAKE_DEBUG_POSTFIX "d")
+
+ option(ld-version-script "Enable linker version script" ON)
+ # Check if LD supports linker scripts.
+@@ -601,12 +599,15 @@ check_include_file(OpenGL/gl.h HAVE_OPENGL_GL_H)
+ check_include_file(OpenGL/glu.h HAVE_OPENGL_GLU_H)
+
+ # Win32 IO
+-set(win32_io FALSE)
+-if(WIN32)
+- set(win32_io TRUE)
++set(USE_WIN32_FILEIO FALSE CACHE BOOL "")
++if(MSVC)
++ if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") #on UWP we use the unix I/O api
++ set(USE_WIN32_FILEIO TRUE CACHE BOOL "" FORCE)
++ add_definitions(-DUSE_WIN32_FILEIO)
++ endif()
++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996)
+ endif()
+
+-set(USE_WIN32_FILEIO ${win32_io})
+
+ # Orthogonal features
+
+@@ -708,16 +709,28 @@ endif()
+
+ #report_values(TIFF_INCLUDES TIFF_LIBRARY_DEPS)
+
++option(BUILD_TOOLS "Build tool executables" ON)
++option(BUILD_DOCS "Build docs" ON)
++option(BUILD_CONTRIB "Build contributed executables" ON)
++option(BUILD_TESTS "Build tests" ON)
++
+ # Process subdirectories
+ add_subdirectory(port)
+ add_subdirectory(libtiff)
+-add_subdirectory(tools)
+-add_subdirectory(test)
+-add_subdirectory(contrib)
+-add_subdirectory(build)
+-add_subdirectory(man)
+-add_subdirectory(html)
+-
++if(BUILD_TOOLS)
++ add_subdirectory(tools)
++endif()
++if(BUILD_TESTS)
++ add_subdirectory(test)
++endif()
++if(BUILD_CONTRIB)
++ add_subdirectory(contrib)
++endif()
++if(BUILD_DOCS)
++ add_subdirectory(build)
++ add_subdirectory(man)
++ add_subdirectory(html)
++endif()
+ #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}")
+
+ message(STATUS "")
+diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
+index 1cf1b75..4ee29f6 100644
+--- a/libtiff/CMakeLists.txt
++++ b/libtiff/CMakeLists.txt
+@@ -104,11 +104,11 @@ set(tiffxx_HEADERS
+ set(tiffxx_SOURCES
+ tif_stream.cxx)
+
+-if(WIN32_IO)
+- extra_dist(tif_unix.c)
++if(USE_WIN32_FILEIO)
++ extra_dist(tif_win32.c)
+ list(APPEND tiff_SOURCES tif_win32.c)
+ else()
+- extra_dist(tif_win32.c)
++ extra_dist(tif_unix.c)
+ list(APPEND tiff_SOURCES tif_unix.c)
+ endif()
+
+@@ -143,7 +143,7 @@ install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS}
+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+
+ if(CXX_SUPPORT)
+- add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS})
++ add_library(tiffxx STATIC ${tiffxx_SOURCES} ${tiffxx_HEADERS})
+ target_link_libraries(tiffxx tiff)
+ set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION})
+ if(NOT CYGWIN)