From 3a54b294df6f1089e33edc209b764deaee141ada Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 3 Dec 2015 16:09:57 -0800 Subject: More libcodecs -> libwscodecs. Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b Reviewed-on: https://code.wireshark.org/review/12420 Reviewed-by: Guy Harris --- codecs/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'codecs/CMakeLists.txt') diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 9f4d64a1b2..37aa95163f 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -set(CODECS_FILES +set(WSCODECS_FILES codecs.c G711a/G711adecode.c G711u/G711udecode.c @@ -41,22 +41,22 @@ file(GLOB EXTRA_CODEC_HEADERS ) if(SBC_FOUND) - set(CODECS_FILES ${CODECS_FILES} sbc/sbc.c) + set(WSCODECS_FILES ${WSCODECS_FILES} sbc/sbc.c) endif() -set(codecs_LIBS +set(wscodecs_LIBS ${GMODULE2_LIBRARIES} wsutil ) -add_library(codecs ${LINK_MODE_LIB} - ${CODECS_FILES} +add_library(wscodecs ${LINK_MODE_LIB} + ${WSCODECS_FILES} ${CMAKE_BINARY_DIR}/image/libwscodecs.rc ) set(FULL_SO_VERSION "0.0.0") -set_target_properties(codecs PROPERTIES +set_target_properties(wscodecs PROPERTIES PREFIX "libws" COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" @@ -65,15 +65,15 @@ set_target_properties(codecs PROPERTIES ) if(ENABLE_APPLICATION_BUNDLE) - set_target_properties(codecs PROPERTIES + set_target_properties(wscodecs PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks ) endif() -target_link_libraries(codecs ${codecs_LIBS}) +target_link_libraries(wscodecs ${wscodecs_LIBS}) if(NOT ${ENABLE_STATIC}) - install(TARGETS codecs + install(TARGETS wscodecs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- cgit v1.2.3