From c74781ea2710f18a9f1c9728fa5eca5d3601ad5b Mon Sep 17 00:00:00 2001 From: Charles Karney 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/ProjUtilities.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake/ProjUtilities.cmake') diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake index d63cedac..447276ff 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -98,17 +98,17 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME) message(SEND_ERROR "Error, the variable TARGET_NAME is not defined!") endif() - if(NOT DEFINED ${PROJECT_INTERN_NAME}_VERSION) + if(NOT DEFINED ${PROJECT_NAME}_VERSION) message(SEND_ERROR - "Error, the variable ${${PROJECT_INTERN_NAME}_VERSION} is not defined!") + "Error, the variable ${${PROJECT_NAME}_VERSION} is not defined!") endif() # On Windows, ABI version is specified using binary file name suffix. # On Unix, suffix is empty and SOVERSION is used instead. if(WIN32) - string(LENGTH "${${PROJECT_INTERN_NAME}_ABI_VERSION}" abilen) + string(LENGTH "${${PROJECT_NAME}_ABI_VERSION}" abilen) if(abilen GREATER 0) - set(SUFFIX "_${${PROJECT_INTERN_NAME}_ABI_VERSION}") + set(SUFFIX "_${${PROJECT_NAME}_ABI_VERSION}") endif() endif() -- cgit v1.2.3