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. --- src/lib_proj.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib_proj.cmake') diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 6bae0778..3c42f973 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -331,7 +331,7 @@ set(ALL_LIBPROJ_SOURCES set(ALL_LIBPROJ_HEADERS ${HEADERS_LIBPROJ}) # Core targets configuration -string(TOLOWER "${PROJECT_INTERN_NAME}" PROJECTNAMEL) +string(TOLOWER "${PROJECT_NAME}" PROJECTNAMEL) set(PROJ_CORE_TARGET ${PROJECTNAMEL}) proj_target_output_name(${PROJ_CORE_TARGET} PROJ_CORE_TARGET_OUTPUT_NAME) @@ -382,21 +382,21 @@ target_include_directories(${PROJ_CORE_TARGET} INTERFACE if(WIN32) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES - VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" + VERSION "${${PROJECT_NAME}_BUILD_VERSION}" OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}" ARCHIVE_OUTPUT_NAME "${PROJ_CORE_TARGET}" CLEAN_DIRECT_OUTPUT 1) elseif(BUILD_FRAMEWORKS_AND_BUNDLE) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES - VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" + VERSION "${${PROJECT_NAME}_BUILD_VERSION}" INSTALL_NAME_DIR ${PROJ_INSTALL_NAME_DIR} CLEAN_DIRECT_OUTPUT 1) else() set_target_properties(${PROJ_CORE_TARGET} PROPERTIES - VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}" - SOVERSION "${${PROJECT_INTERN_NAME}_API_VERSION}" + VERSION "${${PROJECT_NAME}_BUILD_VERSION}" + SOVERSION "${${PROJECT_NAME}_API_VERSION}" CLEAN_DIRECT_OUTPUT 1) endif() -- cgit v1.2.3