Commit e82774e4 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix linking of tester and tools.

parent df21f3b1
...@@ -55,15 +55,6 @@ if(UNIX AND NOT APPLE) ...@@ -55,15 +55,6 @@ if(UNIX AND NOT APPLE)
set(LINUX_OR_BSD 1) set(LINUX_OR_BSD 1)
endif() endif()
if(ENABLE_STATIC)
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip-static mediastreamer_base-static)
if(XV_FOUND)
list(APPEND MS2_LIBS_FOR_TOOLS Xext)
endif()
else()
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip mediastreamer_base)
endif()
include(CMakeDependentOption) include(CMakeDependentOption)
option(ENABLE_SHARED "Build shared library." YES) option(ENABLE_SHARED "Build shared library." YES)
......
...@@ -20,6 +20,16 @@ ...@@ -20,6 +20,16 @@
# #
############################################################################ ############################################################################
if(ENABLE_SHARED)
set(MS2_LIBS_FOR_TESTER mediastreamer_voip mediastreamer_base)
else()
set(MS2_LIBS_FOR_TESTER mediastreamer_voip-static mediastreamer_base-static)
if(XV_FOUND)
list(APPEND MS2_LIBS_FOR_TESTER Xext)
endif()
endif()
set(SOUND_FILES set(SOUND_FILES
sounds/arpeggio_8000_mono.wav sounds/arpeggio_8000_mono.wav
sounds/bird_44100_stereo.wav sounds/bird_44100_stereo.wav
...@@ -84,7 +94,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ...@@ -84,7 +94,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
add_library(mediastreamer2_tester_static STATIC ${SOURCE_FILES_C}) add_library(mediastreamer2_tester_static STATIC ${SOURCE_FILES_C})
target_include_directories(mediastreamer2_tester_static PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) target_include_directories(mediastreamer2_tester_static PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS})
target_link_libraries(mediastreamer2_tester_static ${MS2_LIBS_FOR_TOOLS} ${BCTOOLBOX_TESTER_LIBRARIES}) target_link_libraries(mediastreamer2_tester_static ${MS2_LIBS_FOR_TESTER} ${BCTOOLBOX_TESTER_LIBRARIES})
set(RUNTIME_COMPONENT_SOURCES set(RUNTIME_COMPONENT_SOURCES
mediastreamer2_tester_windows.cpp mediastreamer2_tester_windows.cpp
...@@ -119,7 +129,7 @@ else() ...@@ -119,7 +129,7 @@ else()
add_executable(mediastreamer2_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC}) add_executable(mediastreamer2_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})
endif() endif()
target_include_directories(mediastreamer2_tester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) target_include_directories(mediastreamer2_tester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS})
target_link_libraries(mediastreamer2_tester ${MS2_LIBS_FOR_TOOLS} ${BCTOOLBOX_TESTER_LIBRARIES}) target_link_libraries(mediastreamer2_tester ${MS2_LIBS_FOR_TESTER} ${BCTOOLBOX_TESTER_LIBRARIES})
string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}") string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
if(LINK_FLAGS_STR) if(LINK_FLAGS_STR)
set_target_properties(mediastreamer2_tester PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}") set_target_properties(mediastreamer2_tester PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
......
...@@ -27,6 +27,15 @@ if (IOS) ...@@ -27,6 +27,15 @@ if (IOS)
set(USE_BUNDLE MACOSX_BUNDLE) set(USE_BUNDLE MACOSX_BUNDLE)
endif() endif()
if(ENABLE_SHARED)
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip mediastreamer_base)
else()
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip-static mediastreamer_base-static)
if(XV_FOUND)
list(APPEND MS2_LIBS_FOR_TOOLS Xext)
endif()
endif()
set(simple_executables bench ring mtudiscover tones) set(simple_executables bench ring mtudiscover tones)
if(ENABLE_VIDEO) if(ENABLE_VIDEO)
list(APPEND simple_executables videodisplay test_x11window) list(APPEND simple_executables videodisplay test_x11window)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment