diff options
| -rw-r--r-- | epan/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | filetap/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 10 |
4 files changed, 29 insertions, 14 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 3155663b19..048b8a7661 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1730,8 +1730,11 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark -SET_TARGET_PROPERTIES(epan PROPERTIES OUTPUT_NAME "wireshark") -set_target_properties(epan PROPERTIES FOLDER "DLLs") +SET_TARGET_PROPERTIES(epan PROPERTIES + OUTPUT_NAME "wireshark" + PREFIX "lib" + FOLDER "DLLs" +) target_link_libraries(epan ${epan_LIBS}) diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt index 455f9ddae3..8c3578c3b0 100644 --- a/filetap/CMakeLists.txt +++ b/filetap/CMakeLists.txt @@ -58,10 +58,15 @@ add_library(filetap ${LINK_MODE_LIB} set(FULL_SO_VERSION "0.0.0") -set_target_properties(filetap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") -set_target_properties(filetap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -set_target_properties(filetap PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) -set_target_properties(filetap PROPERTIES FOLDER "DLLs") +set_target_properties(filetap PROPERTIES + COMPILE_DEFINITIONS "WS_BUILD_DLL" + LINK_FLAGS "${WS_LINK_FLAGS}" + VERSION ${FULL_SO_VERSION} SOVERSION 0 + FOLDER "DLLs" +) +IF(MSVC) + set_target_properties(filetap PROPERTIES OUTPUT_NAME "filetap-${PROJECT_VERSION}") +ENDIF() ABICHECK(libfiletap) diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 550ca4d86d..0bdb91fc28 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -117,10 +117,15 @@ add_library(wiretap ${LINK_MODE_LIB} set(FULL_SO_VERSION "0.0.0") -set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") -set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -set_target_properties(wiretap PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) -set_target_properties(wiretap PROPERTIES FOLDER "DLLs") +set_target_properties(wiretap PROPERTIES + COMPILE_DEFINITIONS "WS_BUILD_DLL" + LINK_FLAGS "${WS_LINK_FLAGS}" + VERSION ${FULL_SO_VERSION} SOVERSION 0 + FOLDER "DLLs" +) +IF(MSVC) + set_target_properties(wiretap PROPERTIES OUTPUT_NAME "wiretap-${PROJECT_VERSION}") +ENDIF() ABICHECK(libwiretap) diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index b917fb9088..0f44b8dc51 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -138,10 +138,12 @@ add_dependencies(wsutil gitversion) set(FULL_SO_VERSION "0.0.0") -set_target_properties(wsutil PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") -set_target_properties(wsutil PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -set_target_properties(wsutil PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) -set_target_properties(wsutil PROPERTIES FOLDER "DLLs") +set_target_properties(wsutil PROPERTIES + PREFIX "lib" + COMPILE_DEFINITIONS "WS_BUILD_DLL" + LINK_FLAGS "${WS_LINK_FLAGS}" + VERSION ${FULL_SO_VERSION} SOVERSION 0 + FOLDER "DLLs") ABICHECK(libwsutil) |