aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2020-02-20 08:57:35 +0000
committerKristian Evers <kristianevers@gmail.com>2020-02-20 19:24:12 +0100
commit8cf7204f89c182683d7c4960fa11539143902fd2 (patch)
tree08ad7ca5e17c54fe79dbfdc3b8dca27cc98ac09b
parente8319d7f0897b594fa52b2e39e79d63fb1e03293 (diff)
downloadPROJ-8cf7204f89c182683d7c4960fa11539143902fd2.tar.gz
PROJ-8cf7204f89c182683d7c4960fa11539143902fd2.zip
Add/update description for pkg-config and CMake, ignore proj.pc.in warning
-rw-r--r--CMakeLists.txt5
-rw-r--r--configure.ac3
-rw-r--r--proj.pc.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d1441df..b04c933e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,10 @@
################################################################################
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-project(PROJ LANGUAGES C CXX)
+project(PROJ
+ DESCRIPTION "PROJ coordinate transformation software library"
+ LANGUAGES C CXX
+)
# Only interpret if() arguments as variables or keywords when unquoted
cmake_policy(SET CMP0054 NEW)
diff --git a/configure.ac b/configure.ac
index 3fbd5d3d..88a5ba55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,4 +362,7 @@ fi
AC_CONFIG_FILES([proj.pc])
+dnl Ignore WARNING: 'proj.pc.in' seems to ignore the --datarootdir setting
+AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+
AC_OUTPUT
diff --git a/proj.pc.in b/proj.pc.in
index d63c007c..f66da74d 100644
--- a/proj.pc.in
+++ b/proj.pc.in
@@ -4,8 +4,8 @@ libdir=@libdir@
includedir=@includedir@
datadir=@datadir@/@PACKAGE@
-Name: proj
-Description: Cartographic Projections Library.
+Name: PROJ
+Description: Coordinate transformation software library
Requires:
Version: @VERSION@
Libs: -L${libdir} -lproj