diff options
Diffstat (limited to 'gr-trellis/src/lib/CMakeLists.txt')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index e2abf0238f..05f54b9bd8 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -32,6 +32,9 @@ include_directories( link_directories(${Boost_LIBRARY_DIRS}) +include_directories(${LOG4CPP_INCLUDE_DIRS}) +link_directories(${LOG4CPP_LIBRARY_DIRS}) + ######################################################################## # generate the python helper script which calls into the build utils ######################################################################## @@ -103,6 +106,10 @@ expand_h_cc_i(trellis_sccc_decoder_combined_XX fb fs fi cb cs ci) expand_h_cc_i(trellis_pccc_decoder_X b s i) expand_h_cc_i(trellis_pccc_decoder_combined_XX fb fs fi cb cs ci) +add_custom_target(trellis_generated_includes DEPENDS + ${generated_trellis_includes} +) + ######################################################################## # Create the master trellis swig include files ######################################################################## @@ -147,9 +154,24 @@ list(APPEND gr_trellis_sources ${generated_trellis_sources} ) +#Add Windows DLL resource file if using MSVC +if(MSVC) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-trellis.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc + @ONLY) + + list(APPEND gr_trellis_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc + ) +endif(MSVC) + list(APPEND trellis_libs gnuradio-core ${Boost_LIBRARIES} + ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-trellis SHARED ${gr_trellis_sources}) |