mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-06 03:29:36 +08:00
82a9a8436e
* [libgeotiff] Fix packagename via find_package * Update port_versions * Update portfile.cmake * Update patch * [libgeotiff] Fix packagename via find_package * Update port_versions * Update patch * [pdal] Fix geotiff package name * Update versions * [pdal] Update dependency * Update versions/p-/pdal.json
84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt
|
|
index 43113fa..46331ad 100644
|
|
--- a/libgeotiff/CMakeLists.txt
|
|
+++ b/libgeotiff/CMakeLists.txt
|
|
@@ -172,6 +172,7 @@ IF(WITH_TIFF)
|
|
endif ()
|
|
|
|
IF(TIFF_FOUND)
|
|
+ IF (0)
|
|
# Confirm required API is available
|
|
INCLUDE(CheckFunctionExists)
|
|
SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES})
|
|
@@ -187,6 +188,7 @@ IF(WITH_TIFF)
|
|
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()
|
|
+ ENDIF()
|
|
|
|
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
|
|
ADD_DEFINITIONS(-DHAVE_TIFF=1)
|
|
@@ -298,11 +300,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
|
|
|
|
diff --git a/libgeotiff/bin/CMakeLists.txt b/libgeotiff/bin/CMakeLists.txt
|
|
index 7b12341..b6b1d0c 100644
|
|
--- a/libgeotiff/bin/CMakeLists.txt
|
|
+++ b/libgeotiff/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/libgeotiff/cmake/CMakeLists.txt b/libgeotiff/cmake/CMakeLists.txt
|
|
index 47a2b00..3809ba3 100644
|
|
--- a/libgeotiff/cmake/CMakeLists.txt
|
|
+++ b/libgeotiff/cmake/CMakeLists.txt
|
|
@@ -6,6 +6,7 @@
|
|
# ${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 (0)
|
|
if (NOT WIN32)
|
|
set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
|
|
set (PROJECT_ROOT_DIR "../../..")
|
|
@@ -13,6 +14,10 @@ else ()
|
|
set (INSTALL_CMAKE_DIR "cmake")
|
|
set (PROJECT_ROOT_DIR "..")
|
|
endif ()
|
|
+else()
|
|
+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}")
|
|
+ set (PROJECT_ROOT_DIR "../..")
|
|
+endif()
|
|
|
|
configure_file (project-config.cmake.in project-config.cmake @ONLY)
|
|
configure_file (project-config-version.cmake.in
|