diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
| commit | 99d24d23e95ea0235a8ea2957c289461625765a3 (patch) | |
| tree | 76f2b684acd54450f2af82215e6a2c0841a82321 /gr-wavelet | |
| parent | e1e912858be7cb6d199fd5ca30c559e6afc48233 (diff) | |
| parent | 0d5fd62c70f5f633b124732a17ed90b061f94941 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/lib/CMakeLists.txt
Diffstat (limited to 'gr-wavelet')
| -rw-r--r-- | gr-wavelet/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index aab17ae7f3..76f454746a 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -55,10 +55,7 @@ add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python/wavelet) -# add_subdirectory(grc) endif(ENABLE_PYTHON) -#add_subdirectory(examples) -#add_subdirectory(doc) ######################################################################## # Create Pkg Config File diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 3ae8e591af..9f1d41f3bc 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -26,14 +26,11 @@ include_directories( ${GR_WAVELET_INCLUDE_DIRS} ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ) -# is this correct? link_directories(${GR_WAVELET_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) link_directories(${GSL_LIBRARY_DIRS}) add_definitions(${GSL_DEFINITIONS}) @@ -42,9 +39,6 @@ if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Setup library ######################################################################## @@ -74,7 +68,6 @@ list(APPEND wavelet_libs ${Boost_LIBRARIES} ${WAVELET_LIBRARIES} ${GSL_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources}) |