From c74781ea2710f18a9f1c9728fa5eca5d3601ad5b Mon Sep 17 00:00:00 2001
From: Charles Karney <charles.karney@sri.com>
Date: Tue, 4 Feb 2020 14:20:28 -0500
Subject: Make PROJ the CMake project name

Allow both find_package(PROJ) and find_package(PROJ4).  More details
are in cmake/CMakeLists.txt.
---
 cmake/ProjVersion.cmake | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'cmake/ProjVersion.cmake')

diff --git a/cmake/ProjVersion.cmake b/cmake/ProjVersion.cmake
index 5614d44d..d64795a8 100644
--- a/cmake/ProjVersion.cmake
+++ b/cmake/ProjVersion.cmake
@@ -27,27 +27,27 @@ macro(proj_version)
     ${ARGN})
 
   # Set version components
-  set(${PROJECT_INTERN_NAME}_VERSION_MAJOR ${THIS_VERSION_MAJOR})
-  set(${PROJECT_INTERN_NAME}_VERSION_MINOR ${THIS_VERSION_MINOR})
-  set(${PROJECT_INTERN_NAME}_VERSION_PATCH ${THIS_VERSION_PATCH})
+  set(${PROJECT_NAME}_VERSION_MAJOR ${THIS_VERSION_MAJOR})
+  set(${PROJECT_NAME}_VERSION_MINOR ${THIS_VERSION_MINOR})
+  set(${PROJECT_NAME}_VERSION_PATCH ${THIS_VERSION_PATCH})
 
   # Set VERSION string
-  set(${PROJECT_INTERN_NAME}_VERSION
-    "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}.\
-${${PROJECT_INTERN_NAME}_VERSION_MINOR}.\
-${${PROJECT_INTERN_NAME}_VERSION_PATCH}")
+  set(${PROJECT_NAME}_VERSION
+    "${${PROJECT_NAME}_VERSION_MAJOR}.\
+${${PROJECT_NAME}_VERSION_MINOR}.\
+${${PROJECT_NAME}_VERSION_PATCH}")
 
   # Set ABI version string used to name binary output
   # On Windows, ABI version is specified using binary file name suffix.
   if(WIN32)
-    set(${PROJECT_INTERN_NAME}_ABI_VERSION
-      "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}_\
-${${PROJECT_INTERN_NAME}_VERSION_MINOR}")
+    set(${PROJECT_NAME}_ABI_VERSION
+      "${${PROJECT_NAME}_VERSION_MAJOR}_\
+${${PROJECT_NAME}_VERSION_MINOR}")
   endif()
 
   message(STATUS "")
-  boost_report_value(${PROJECT_INTERN_NAME}_VERSION)
+  boost_report_value(${PROJECT_NAME}_VERSION)
   if(WIN32)
-    boost_report_value(${PROJECT_INTERN_NAME}_ABI_VERSION)
+    boost_report_value(${PROJECT_NAME}_ABI_VERSION)
   endif()
 endmacro()
-- 
cgit v1.2.3