Merge pull request #1581 from jef-n/win-no-abi-lib

stick with proj.lib on windows
OSGeo · Sep 5, 2019 · 06578ae · 06578ae
2 parents 1c2a58b + 6b99e02
commit 06578ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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}