projects / packages / gnuradio.git / blame
| Commit | Line | Data |
|---|---|---|
| d6476722 JR |
1 | diff -ur gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt |
| 2 | --- gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt 2015-08-28 14:47:45.000000000 +0000 | |
| 3 | +++ gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000 | |
| 4 | @@ -154,7 +154,7 @@ | |
| 5 | ||
| 6 | #need to link with librt on ubuntu 11.10 for shm_* | |
| 921f46a9 | 7 | if((LINUX) OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")) |
| d6476722 JR |
8 | - list(APPEND gnuradio_runtime_libs rt) |
| 9 | + list(APPEND gnuradio_runtime_libs rt pthread) | |
| 10 | endif() | |
| 11 | ||
| 12 | ######################################################################## | |
| 13 | diff -ur gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt | |
| 14 | --- gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt 2015-04-13 14:32:43.000000000 +0000 | |
| 15 | +++ gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000 | |
| 16 | @@ -96,7 +96,7 @@ | |
| 17 | ||
| 18 | include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/jack) | |
| 19 | include_directories(${JACK_INCLUDE_DIRS}) | |
| 20 | - list(APPEND gr_audio_libs ${JACK_LIBRARIES}) | |
| 21 | + list(APPEND gr_audio_libs ${JACK_LIBRARIES} pthread) | |
| 22 | add_definitions(${JACK_DEFINITIONS}) | |
| 23 | list(APPEND gr_audio_sources | |
| 24 | ${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_impl.cc | |
| 25 | diff -ur gnuradio-3.7.9.2.orig/gr-fcd/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-fcd/lib/CMakeLists.txt | |
| 26 | --- gnuradio-3.7.9.2.orig/gr-fcd/lib/CMakeLists.txt 2015-04-13 14:32:43.000000000 +0000 | |
| 27 | +++ gnuradio-3.7.9.2/gr-fcd/lib/CMakeLists.txt 2016-05-23 05:30:48.925691583 +0000 | |
| 28 | @@ -88,7 +88,7 @@ | |
| 29 | ||
| 30 | add_library(gnuradio-fcd SHARED ${gr_fcd_sources}) | |
| 31 | if (LINUX) | |
| 32 | - list(APPEND fcd_libs rt) | |
| 33 | + list(APPEND fcd_libs rt pthread) | |
| 34 | endif() | |
| 35 | target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CPP_LIBRARIES}) | |
| 36 | ||
| 37 | diff -ur gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt gnuradio-3.7.9.2/volk/lib/CMakeLists.txt | |
| 38 | --- gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt 2016-03-31 05:23:12.000000000 +0000 | |
| 39 | +++ gnuradio-3.7.9.2/volk/lib/CMakeLists.txt 2016-05-23 05:30:48.925691583 +0000 | |
| 40 | @@ -534,7 +534,7 @@ | |
| 41 | ||
| 42 | #Add dynamic library | |
| 43 | add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>) | |
| 44 | - target_link_libraries(volk ${volk_libraries}) | |
| 45 | + target_link_libraries(volk ${volk_libraries} m) | |
| 921f46a9 JR |
46 | target_include_directories(volk |
| 47 | PUBLIC ${PROJECT_BINARY_DIR}/include | |
| 48 | PUBLIC ${PROJECT_SOURCE_DIR}/include | |
| d6476722 JR |
49 | @@ -563,7 +563,7 @@ |
| 50 | else() | |
| 51 | #create the volk runtime library | |
| 52 | add_library(volk SHARED ${volk_sources}) | |
| 53 | - target_link_libraries(volk ${volk_libraries}) | |
| 54 | + target_link_libraries(volk ${volk_libraries} m) | |
| 921f46a9 JR |
55 | include_directories(volk |
| 56 | PUBLIC ${PROJECT_BINARY_DIR}/include | |
| 57 | PUBLIC ${PROJECT_SOURCE_DIR}/include |