diff options
| author | Charles Karney <charles@karney.com> | 2020-02-04 19:15:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 19:15:57 -0500 |
| commit | 1067766790174665b455ff94846e37531225d69b (patch) | |
| tree | 5ac9b164dee3890f63f1e6c9ab0f6b81764e3633 /src | |
| parent | afda50628d690bb56debbe1a4116bc32c3143943 (diff) | |
| parent | c74781ea2710f18a9f1c9728fa5eca5d3601ad5b (diff) | |
| download | PROJ-1067766790174665b455ff94846e37531225d69b.tar.gz PROJ-1067766790174665b455ff94846e37531225d69b.zip | |
Merge pull request #1910 from cffk/cmake-proj
Make PROJ the CMake project name addressing first stage of #1885
Let's go with this! It's conceivable that there's some wrinkle I haven't thought about. So let's expose the changes to a wider community.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib_proj.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
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() |