Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LibLZMA] automatic configuration #6000

Merged
merged 37 commits into from May 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7dc6582
[LibLZMA] add a config-generated by CMake
cenit Apr 8, 2019
4f41d54
bump control files of LibLZMA and dependent ports
cenit Apr 8, 2019
d845870
[tiff] use proper liblzma target
cenit Apr 8, 2019
68404e3
[liblzma] fix header install path
cenit Apr 9, 2019
3b28c24
[LibLZMA] avoid using targets in old symbols
cenit Apr 10, 2019
cbf4dfd
fixes for windows-static and trying to see if CI is happier with a sh…
cenit Apr 13, 2019
4658946
[LibLZMA] use only modern CMake language, remove patch in favour of t…
cenit Apr 13, 2019
ea77d3c
[lzma] put symbols in cmake cache
cenit Apr 24, 2019
76f5b43
Merge branch 'master' into dev/cenit/lzma
cenit May 2, 2019
6c48a8a
Merge branch 'master' into dev/cenit/lzma
cenit May 8, 2019
c49c53e
[libxmlpp] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS regression
cenit May 8, 2019
1175029
Merge branch 'master' into dev/cenit/lzma
cenit May 13, 2019
946895b
[lzma] fix header install path
cenit May 15, 2019
2810993
Merge branch 'master' into dev/cenit/lzma
cenit May 17, 2019
375a8bc
[liblzma] install wrapper to force config mode
cenit May 18, 2019
2aac166
[liblzma] remove function check inside cmake config since we know it …
cenit May 18, 2019
67d66b9
Merge branch 'master' into dev/cenit/lzma
cenit May 22, 2019
4fd5b73
[liblzma] wrapper fix
cenit May 22, 2019
3c0df9b
[tiff,geotiff] general cleanup and patch fixes
cenit May 22, 2019
9a966de
[libgeotiff] remove debug tools
cenit May 22, 2019
b5efba8
[tesseract] modernize
cenit May 22, 2019
3007a13
[tiff] fix also tiff_library symbol
cenit May 22, 2019
bb0f323
[pdal,libgeotiff] better library integration
cenit May 24, 2019
263a718
[tiff] restore using unix i/o on UWP, since it was working... for sur…
cenit May 24, 2019
3c1b1b4
Merge branch 'master' into dev/cenit/lzma
cenit May 25, 2019
3d35a5c
[tiff] enable lzma also on uwp, since it works and is requested by ma…
cenit May 25, 2019
e007594
[selene] enable build on arm/arm64-windows, which was surely broken b…
cenit May 25, 2019
296e759
Merge branch 'master' into dev/cenit/lzma
cenit May 26, 2019
88eb932
[lzma] uniform naming with cmake 3.14
cenit May 26, 2019
77c68fb
[podofo] fix regression, it requires openssl which was disabled in de…
cenit May 27, 2019
3d81199
[many ports] remove unnecessary mods
cenit May 27, 2019
39b9585
[boost-iostream] chmod
cenit May 27, 2019
85252ce
[openssl] fix regression due to missing architecture
cenit May 27, 2019
c061f65
[podofo] fix regression on uwp due to missing include
cenit May 27, 2019
0b78e34
[libpq] explicitly fail on UWP, it should avoid being marked as regre…
cenit May 27, 2019
dc6b06f
wqMerge branch 'master' into dev/cenit/lzma
cenit May 28, 2019
01c4e56
[shiva] fix regression on linux
cenit May 28, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view

This file was deleted.

28 changes: 0 additions & 28 deletions ports/libgeotiff/0002-Fix-directory-output.patch

This file was deleted.

64 changes: 0 additions & 64 deletions ports/libgeotiff/0004-Fix-libxtiff-installation.patch

This file was deleted.

This file was deleted.

42 changes: 0 additions & 42 deletions ports/libgeotiff/0006-Fix-utility-link-error.patch

This file was deleted.

4 changes: 2 additions & 2 deletions ports/libgeotiff/CONTROL
@@ -1,4 +1,4 @@
Source: libgeotiff
Version: 1.4.2-8
Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
Version: 1.4.2-9
Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
Build-Depends: tiff, proj4, zlib, libjpeg-turbo
124 changes: 124 additions & 0 deletions ports/libgeotiff/cmakelists.patch
@@ -0,0 +1,124 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c70973..617978c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,22 +190,6 @@ IF(WITH_TIFF)
endif ()

IF(TIFF_FOUND)
- # Confirm required API is available
- INCLUDE(CheckFunctionExists)
- SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES})
-
- CHECK_FUNCTION_EXISTS(TIFFOpen HAVE_TIFFOPEN)
- IF(NOT HAVE_TIFFOPEN)
- SET(TIFF_FOUND) # ReSET to NOT found for TIFF library
- MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFOpen function not found")
- ENDIF()
-
- CHECK_FUNCTION_EXISTS(TIFFMergeFieldInfo HAVE_TIFFMERGEFIELDINFO)
- IF(NOT HAVE_TIFFMERGEFIELDINFO)
- SET(TIFF_FOUND) # ReSET to NOT found for TIFF library
- MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFMergeFieldInfo function not found. libtiff 3.6.0 Beta or later required. Please upgrade or use an older version of libgeotiff")
- ENDIF()
-
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
ADD_DEFINITIONS(-DHAVE_TIFF=1)
ENDIF(TIFF_FOUND)
@@ -354,11 +338,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
# INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)

-###############################################################################
-# Build libxtiff library
-
-ADD_SUBDIRECTORY(libxtiff)
-
###############################################################################
# Build libgeotiff library

@@ -427,13 +406,9 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES)
set (CMAKE_DEBUG_POSTFIX _d)
endif ()

-ADD_LIBRARY(${GEOTIFF_ARCHIVE_TARGET} STATIC
- ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES})
-SET_TARGET_PROPERTIES(${GEOTIFF_ARCHIVE_TARGET} PROPERTIES
- OUTPUT_NAME ${GEOTIFF_LIB_NAME})

# Shared libgeotiff library
-ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} SHARED
+ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET}
${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES})

# Windows:
@@ -478,7 +453,7 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET}
# LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
# ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR})

-INSTALL( TARGETS ${GEOTIFF_ARCHIVE_TARGET} ${GEOTIFF_LIBRARY_TARGET}
+INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
EXPORT depends
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 7b12341..b6b1d0c 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -6,9 +6,6 @@
#
###############################################################################

-INCLUDE_DIRECTORIES(
- .
- ${CMAKE_SOURCE_DIR})

IF(WIN32 AND MSVC)
SET(GETOPT_SOURCE getopt.c)
@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build")

FOREACH(utility ${GEOTIFF_UTILITIES})
ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE})
- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET})
+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET})
ENDFOREACH()

ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE})
TARGET_LINK_LIBRARIES(geotifcp
- xtiff
${GEOTIFF_LIBRARY_TARGET}
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES})
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 47a2b00..ffbd004 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -6,13 +6,8 @@
# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
# path to the root from there. (Note that the whole install tree can
# be relocated.)
-if (NOT WIN32)
- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
- set (PROJECT_ROOT_DIR "../../..")
-else ()
- set (INSTALL_CMAKE_DIR "cmake")
- set (PROJECT_ROOT_DIR "..")
-endif ()
+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}")
+ set (PROJECT_ROOT_DIR "../..")

configure_file (project-config.cmake.in project-config.cmake @ONLY)
configure_file (project-config-version.cmake.in
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
index 6b5499f..e4ddd11 100644
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@@ -33,7 +33,7 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
message (STATUS " include directory: \${@PROJECT_NAME@_INCLUDE_DIRS}")

set (@PROJECT_NAME@_SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
-set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_ARCHIVE_TARGET@)
+set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
# Read in the exported definition of the library
include ("${_DIR}/@PROJECT_NAME_LOWER@-depends.cmake")