diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-09-05 13:27:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 13:27:44 +0200 |
| commit | 06578ae686d85c1e7b0fff663d25a8e394c67f19 (patch) | |
| tree | ec8dbde417f35a910b97e1f5716177b8da10acc4 | |
| parent | 1c2a58b2ad57837c2397581a7032cda7b34e46b0 (diff) | |
| parent | 6b99e02f04e7e4b54b1209697ab260b8e3dc733a (diff) | |
| download | PROJ-06578ae686d85c1e7b0fff663d25a8e394c67f19.tar.gz PROJ-06578ae686d85c1e7b0fff663d25a8e394c67f19.zip | |
Merge pull request #1581 from jef-n/win-no-abi-lib
stick with proj.lib on windows
| -rw-r--r-- | cmake/ProjUtilities.cmake | 3 | ||||
| -rw-r--r-- | src/bin_proj.cmake | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake index 1a2b6052..d63cedac 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -89,7 +89,8 @@ endfunction() # # Generates output name for given target depending on platform and version. -# For instance, on Windows, libraries get ABI version suffix proj_X_Y.{dll|lib}. +# For instance, on Windows, dynamic link libraries get ABI version suffix +# proj_X_Y.dll. # function(proj_target_output_name TARGET_NAME OUTPUT_NAME) diff --git a/src/bin_proj.cmake b/src/bin_proj.cmake index ce282fc6..3826ac8d 100644 --- a/src/bin_proj.cmake +++ b/src/bin_proj.cmake @@ -9,7 +9,7 @@ source_group("Source Files\\Bin" FILES ${PROJ_SRC}) add_executable(binproj ${PROJ_SRC}) set_target_properties(binproj PROPERTIES - OUTPUT_NAME proj) + RUNTIME_OUTPUT_NAME proj) target_link_libraries(binproj ${PROJ_LIBRARIES}) target_compile_options(binproj PRIVATE ${PROJ_CXX_WARN_FLAGS}) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index bad60324..d1d6f766 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -405,6 +405,7 @@ if(WIN32) PROPERTIES VERSION "${${PROJECT_INTERN_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} |