From e1a0d132ca75681b3c58ef622f5f1ff3b2ca711c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Sep 2018 12:47:42 +0200 Subject: [PATCH 2/8] Link against shared library Signed-off-by: Peter Lemenkov --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8818270a..dae6f0c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,11 +192,11 @@ target_link_libraries ( cpuid ${ly_lib_static} ) # this creates the conversion tool add_executable ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) -target_link_libraries ( yuvconvert ${ly_lib_static} ) +target_link_libraries ( yuvconvert ${ly_lib_shared} ) # this creates the yuvconstants tool add_executable ( yuvconstants ${ly_base_dir}/util/yuvconstants.c ) -target_link_libraries ( yuvconstants ${ly_lib_static} ) +target_link_libraries ( yuvconstants ${ly_lib_shared} ) find_package ( JPEG ) if (JPEG_FOUND) @@ -226,7 +226,7 @@ if(UNIT_TEST) endif() add_executable(libyuv_unittest ${ly_unittest_sources}) - target_link_libraries(libyuv_unittest ${ly_lib_name} ${GTEST_LIBRARY}) + target_link_libraries(libyuv_unittest ${ly_lib_shared} ${GTEST_LIBRARY}) find_library(PTHREAD_LIBRARY pthread) if(NOT PTHREAD_LIBRARY STREQUAL "PTHREAD_LIBRARY-NOTFOUND") target_link_libraries(libyuv_unittest pthread) -- 2.49.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fddd2bb..fa2590ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ target_link_libraries ( yuvconvert ${ly_lib_shared} ) # this creates the yuvconstants tool add_executable ( yuvconstants ${ly_base_dir}/util/yuvconstants.c ) -target_link_libraries ( yuvconstants ${ly_lib_shared} ) +target_link_libraries ( yuvconstants ${ly_lib_shared} m ) find_package ( JPEG ) if (JPEG_FOUND)