diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 07:26:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 07:26:39 -0500 |
| commit | 1fd07adc2857bf094d1b8a6a84787a9fd4daf945 (patch) | |
| tree | edd3c16ce247a4b37a9663df699cd8df2d1cf6b2 /gnuradio-core/src/lib | |
| parent | eb65d13213ea163b4e0a60dc7ecaa5921981a412 (diff) | |
| parent | b4e87c06e00a5ab40bf6fa343af724d76f49d00d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt index f9c401abe9..a9d520c7a3 100644 --- a/gnuradio-core/src/lib/CMakeLists.txt +++ b/gnuradio-core/src/lib/CMakeLists.txt @@ -146,10 +146,6 @@ include_directories(${CPPUNIT_INCLUDE_DIRS}) link_directories(${CPPUNIT_LIBRARY_DIRS}) add_library(test-gnuradio-core SHARED ${test_gnuradio_core_sources}) -target_link_libraries(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES}) - -if(LOG4CXX_FOUND) - target_link_libraries(test-gnuradio-core gnuradio-core ${LOG4CXX_LIBRARIES}) -endif(LOG4CXX_FOUND) +target_link_libraries(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES}) endif(ENABLE_TESTING) |