aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Massing <m.massing@warped-space.de>2016-11-28 14:57:19 +0100
committerManuel Massing <m.massing@warped-space.de>2016-11-28 15:02:51 +0100
commit524f716570aad90e3f7c3094af3eec8e548dec71 (patch)
treed0ef858da5dcebd4f4228772c878c8fc9d031f39
parent16a3384f9a3784c3275977880d0daf73ece44243 (diff)
downloadvcpkg-524f716570aad90e3f7c3094af3eec8e548dec71.tar.gz
vcpkg-524f716570aad90e3f7c3094af3eec8e548dec71.zip
[proj4] Rename port from "proj4" to "proj"
-rw-r--r--ports/proj/0001-CMake-add-detection-of-recent-visual-studio-versions.patch (renamed from ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch)0
-rw-r--r--ports/proj/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch (renamed from ports/proj4/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch)0
-rw-r--r--ports/proj/0003-CMake-configurable-cmake-config-install-location.patch (renamed from ports/proj4/0003-CMake-configurable-cmake-config-install-location.patch)0
-rw-r--r--ports/proj/CONTROL (renamed from ports/proj4/CONTROL)2
-rw-r--r--ports/proj/portfile.cmake (renamed from ports/proj4/portfile.cmake)8
5 files changed, 5 insertions, 5 deletions
diff --git a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch b/ports/proj/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
index 9be5438aa..9be5438aa 100644
--- a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
+++ b/ports/proj/0001-CMake-add-detection-of-recent-visual-studio-versions.patch
diff --git a/ports/proj4/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch b/ports/proj/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch
index 2c470570e..2c470570e 100644
--- a/ports/proj4/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch
+++ b/ports/proj/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch
diff --git a/ports/proj4/0003-CMake-configurable-cmake-config-install-location.patch b/ports/proj/0003-CMake-configurable-cmake-config-install-location.patch
index 5870e12ea..5870e12ea 100644
--- a/ports/proj4/0003-CMake-configurable-cmake-config-install-location.patch
+++ b/ports/proj/0003-CMake-configurable-cmake-config-install-location.patch
diff --git a/ports/proj4/CONTROL b/ports/proj/CONTROL
index f31a03049..b706ca11a 100644
--- a/ports/proj4/CONTROL
+++ b/ports/proj/CONTROL
@@ -1,3 +1,3 @@
-Source: proj4
+Source: proj
Version: 4.9.3
Description: PROJ.4 library for cartographic projections
diff --git a/ports/proj4/portfile.cmake b/ports/proj/portfile.cmake
index d38a1b4ab..c67edb70c 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj/portfile.cmake
@@ -26,8 +26,8 @@ vcpkg_configure_cmake(
OPTIONS ${CMAKE_OPTIONS}
-DPROJ_LIB_SUBDIR=lib
-DPROJ_INCLUDE_SUBDIR=include
- -DPROJ_DATA_SUBDIR=share/proj4
- -DPROJ_CMAKE_CONFIG_SUBDIR=share/proj4
+ -DPROJ_DATA_SUBDIR=share/proj
+ -DPROJ_CMAKE_CONFIG_SUBDIR=share/proj
-DBUILD_CS2CS=NO
-DBUILD_PROJ=NO
-DBUILD_GEOD=NO
@@ -49,5 +49,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj4)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/proj4/COPYING ${CURRENT_PACKAGES_DIR}/share/proj4/copyright)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/proj/COPYING ${CURRENT_PACKAGES_DIR}/share/proj/copyright)