aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Miura <miurahr@linux.com>2018-02-09 07:15:21 +0900
committerHiroshi Miura <miurahr@linux.com>2018-02-09 07:24:25 +0900
commitf68711ed02ac2041f8760c8dc32b9b3804422189 (patch)
tree252e8058511230623f7d9ec3e4af857e633fa524
parent5ef129e8806529cc552db6a017e44592e1222f56 (diff)
downloadvcpkg-f68711ed02ac2041f8760c8dc32b9b3804422189.tar.gz
vcpkg-f68711ed02ac2041f8760c8dc32b9b3804422189.zip
[libgeotiff] fix install directory for cmake configurations
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
-rw-r--r--ports/libgeotiff/fix-directory-output.patch14
-rw-r--r--ports/libgeotiff/portfile.cmake4
2 files changed, 18 insertions, 0 deletions
diff --git a/ports/libgeotiff/fix-directory-output.patch b/ports/libgeotiff/fix-directory-output.patch
new file mode 100644
index 000000000..82032daa1
--- /dev/null
+++ b/ports/libgeotiff/fix-directory-output.patch
@@ -0,0 +1,14 @@
+diff -urN a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+--- a/cmake/CMakeLists.txt 2016-08-12 00:40:10.000000000 +0900
++++ b/cmake/CMakeLists.txt 2018-02-09 07:12:40.422110239 +0900
+@@ -10,8 +10,8 @@
+ set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
+ set (PROJECT_ROOT_DIR "../../..")
+ else ()
+- set (INSTALL_CMAKE_DIR "cmake")
+- set (PROJECT_ROOT_DIR "..")
++ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}")
++ set (PROJECT_ROOT_DIR "../..")
+ endif ()
+
+ configure_file (project-config.cmake.in project-config.cmake @ONLY)
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index d62c26d82..5920a0853 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -11,6 +11,10 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-directory-output.patch")
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(BUILD_SHARED_LIBS ON)
else()