Added libpng++ to dependencies
This commit is contained in:
parent
b358d1b4ca
commit
8acd0fe62e
|
@ -130,11 +130,12 @@ find_package(Doxygen)
|
||||||
find_package(Volk REQUIRED)
|
find_package(Volk REQUIRED)
|
||||||
find_package(OggVorbis REQUIRED)
|
find_package(OggVorbis REQUIRED)
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
|
find_package(png++ REQUIRED)
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Include or not into the module blocks for debugging
|
# Include or not into the module blocks for debugging
|
||||||
########################################################################
|
########################################################################
|
||||||
option(INCLUDE_DEBUG_BLOCKS
|
option(INCLUDE_DEBUG_BLOCKS
|
||||||
"Enable/Disable blocks that are used for debugging purposes" ON)
|
"Enable/Disable blocks that are used for debugging purposes" ON)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,61 @@
|
||||||
|
# - Try to find png++
|
||||||
|
#
|
||||||
|
# The following variables are optionally searched for defaults
|
||||||
|
# png++_ROOT_DIR: Base directory where all GLOG components are found
|
||||||
|
#
|
||||||
|
# The following are set after configuration is done:
|
||||||
|
# png++_FOUND
|
||||||
|
# png++_INCLUDE_DIRS
|
||||||
|
# png++_LIBRARIES
|
||||||
|
|
||||||
|
find_package(PNG REQUIRED)
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
|
set(png++_ROOT_DIR "" CACHE PATH "Folder contains png++")
|
||||||
|
|
||||||
|
find_path(png++_INCLUDE_DIR
|
||||||
|
NAMES
|
||||||
|
png++/color.hpp
|
||||||
|
png++/config.hpp
|
||||||
|
png++/consumer.hpp
|
||||||
|
png++/convert_color_space.hpp
|
||||||
|
png++/end_info.hpp
|
||||||
|
png++/error.hpp
|
||||||
|
png++/ga_pixel.hpp
|
||||||
|
png++/generator.hpp
|
||||||
|
png++/gray_pixel.hpp
|
||||||
|
png++/image.hpp
|
||||||
|
png++/image_info.hpp
|
||||||
|
png++/index_pixel.hpp
|
||||||
|
png++/info.hpp
|
||||||
|
png++/info_base.hpp
|
||||||
|
png++/io_base.hpp
|
||||||
|
png++/packed_pixel.hpp
|
||||||
|
png++/palette.hpp
|
||||||
|
png++/pixel_buffer.hpp
|
||||||
|
png++/pixel_traits.hpp
|
||||||
|
png++/png.hpp
|
||||||
|
png++/reader.hpp
|
||||||
|
png++/require_color_space.hpp
|
||||||
|
png++/rgb_pixel.hpp
|
||||||
|
png++/rgba_pixel.hpp
|
||||||
|
png++/streaming_base.hpp
|
||||||
|
png++/tRNS.hpp
|
||||||
|
png++/types.hpp
|
||||||
|
png++/writer.hpp
|
||||||
|
PATHS
|
||||||
|
${png++_ROOT_DIR}
|
||||||
|
PATH_SUFFIXES
|
||||||
|
src)
|
||||||
|
|
||||||
|
set(png++_INCLUDE_DIRS ${png++_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
|
||||||
|
set(png++_LIBRARIES ${PNG_LIBRARIES})
|
||||||
|
|
||||||
|
find_package_handle_standard_args(png++ DEFAULT_MSG
|
||||||
|
png++_INCLUDE_DIR)
|
||||||
|
|
||||||
|
if(png++_FOUND)
|
||||||
|
set(png++_INCLUDE_DIRS ${png++_INCLUDE_DIR})
|
||||||
|
set(png++_LIBRARIES ${png++_LIBRARY})
|
||||||
|
endif()
|
|
@ -28,6 +28,7 @@ include_directories(
|
||||||
${VORBIS_INCLUDE_DIR}
|
${VORBIS_INCLUDE_DIR}
|
||||||
${OGG_INCLUDE_DIR}
|
${OGG_INCLUDE_DIR}
|
||||||
${PNG_INCLUDE_DIR}
|
${PNG_INCLUDE_DIR}
|
||||||
|
${png++_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
link_directories(${Boost_LIBRARY_DIRS})
|
link_directories(${Boost_LIBRARY_DIRS})
|
||||||
|
@ -36,14 +37,14 @@ list(APPEND satnogs_debug_sources
|
||||||
morse_debug_source_impl.cc
|
morse_debug_source_impl.cc
|
||||||
debug_msg_source_impl.cc
|
debug_msg_source_impl.cc
|
||||||
debug_msg_source_raw_impl.cc
|
debug_msg_source_raw_impl.cc
|
||||||
leo_channel_impl.cc
|
leo_channel_impl.cc
|
||||||
cw_encoder_impl.cc
|
cw_encoder_impl.cc
|
||||||
)
|
)
|
||||||
list(APPEND satnogs_sources
|
list(APPEND satnogs_sources
|
||||||
morse_tree.cc
|
morse_tree.cc
|
||||||
morse_decoder_impl.cc
|
morse_decoder_impl.cc
|
||||||
multi_format_msg_sink_impl.cc
|
multi_format_msg_sink_impl.cc
|
||||||
ogg_encoder_impl.cc
|
ogg_encoder_impl.cc
|
||||||
cw_to_symbol_impl.cc
|
cw_to_symbol_impl.cc
|
||||||
sine_matched_filter_ff_impl.cc
|
sine_matched_filter_ff_impl.cc
|
||||||
udp_msg_source_impl.cc
|
udp_msg_source_impl.cc
|
||||||
|
@ -77,16 +78,17 @@ if(NOT satnogs_sources)
|
||||||
endif(NOT satnogs_sources)
|
endif(NOT satnogs_sources)
|
||||||
|
|
||||||
add_library(gnuradio-satnogs SHARED ${satnogs_sources})
|
add_library(gnuradio-satnogs SHARED ${satnogs_sources})
|
||||||
target_link_libraries(gnuradio-satnogs
|
target_link_libraries(gnuradio-satnogs
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
${GNURADIO_ALL_LIBRARIES}
|
${GNURADIO_ALL_LIBRARIES}
|
||||||
${CMAKE_THREAD_LIBS_INIT}
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
${NOVA_LIBRARIES}
|
${NOVA_LIBRARIES}
|
||||||
${VOLK_LIBRARIES}
|
${VOLK_LIBRARIES}
|
||||||
${OGGVORBIS_LIBRARIES}
|
${OGGVORBIS_LIBRARIES}
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
|
${png++_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(gnuradio-satnogs PROPERTIES DEFINE_SYMBOL "gnuradio_satnogs_EXPORTS")
|
set_target_properties(gnuradio-satnogs PROPERTIES DEFINE_SYMBOL "gnuradio_satnogs_EXPORTS")
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
|
|
Loading…
Reference in New Issue