diff options
| author | Juergen E. Fischer <jef@norbit.de> | 2019-09-03 16:41:26 +0200 |
|---|---|---|
| committer | Juergen E. Fischer <jef@norbit.de> | 2019-09-03 20:10:29 +0200 |
| commit | 6b99e02f04e7e4b54b1209697ab260b8e3dc733a (patch) | |
| tree | 372fc79265fe4e56dc07d169fb228448c6667dfc /src | |
| parent | b52285e9155228fb46fe9e792d21e600daa4c132 (diff) | |
| download | PROJ-6b99e02f04e7e4b54b1209697ab260b8e3dc733a.tar.gz PROJ-6b99e02f04e7e4b54b1209697ab260b8e3dc733a.zip | |
stick with proj.lib on windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin_proj.cmake | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
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} |