build: Cleanup pass on the new GR 3.8 CMake update
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
parent
3c108e2726
commit
6c9576670a
|
|
@ -26,6 +26,9 @@ include(GNUInstallDirs)
|
|||
project(gr-iqbalance CXX C)
|
||||
enable_testing()
|
||||
|
||||
#policy setup
|
||||
cmake_policy(SET CMP0011 NEW)
|
||||
|
||||
#select the release build type by default to get optimization flags
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
|
|
@ -34,16 +37,18 @@ endif(NOT CMAKE_BUILD_TYPE)
|
|||
set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
|
||||
|
||||
########################################################################
|
||||
# set search path for cmake modules to OOT, Gnuradio
|
||||
# GNURadio setup
|
||||
########################################################################
|
||||
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
||||
find_package(Gnuradio "3.8" REQUIRED runtime)
|
||||
|
||||
# Find GNURadio
|
||||
find_package(Gnuradio "3.8" REQUIRED)
|
||||
|
||||
# Set the version information here
|
||||
set(VERSION_INFO_MAJOR_VERSION 3)
|
||||
set(VERSION_INFO_API_COMPAT 8)
|
||||
set(VERSION_INFO_MINOR_VERSION 0)
|
||||
set(VERSION_INFO_MAINT_VERSION "")
|
||||
set(VERSION_MAJOR 3)
|
||||
set(VERSION_API 8)
|
||||
set(VERSION_ABI 0)
|
||||
set(VERSION_PATCH 0)
|
||||
include(GrVersion) #setup version info
|
||||
|
||||
########################################################################
|
||||
|
|
@ -66,20 +71,10 @@ else()
|
|||
message(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
endif()
|
||||
|
||||
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
else()
|
||||
message(WARNING "C standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
endif()
|
||||
|
||||
########################################################################
|
||||
# Find boost
|
||||
########################################################################
|
||||
find_package(Boost "1.67" REQUIRED system)
|
||||
find_package(Boost "1.65" REQUIRED system)
|
||||
|
||||
if(NOT Boost_FOUND)
|
||||
message(FATAL_ERROR "Boost required to compile iqbalance")
|
||||
|
|
@ -102,15 +97,13 @@ find_package(LibOsmoDSP)
|
|||
if(LIBOSMODSP_FOUND)
|
||||
set(LIBOSMODSP_SEL_INCLUDE_DIRS ${LIBOSMODSP_INCLUDE_DIRS})
|
||||
set(LIBOSMODSP_SEL_LIBRARIES ${LIBOSMODSP_LIBRARIES})
|
||||
set(LIBOSMODSP_SEL_LIBRARY_DIRS ${LIBOSMODSP_LIBRARY_DIRS})
|
||||
set(LIBOSMODSP_SEL_SOURCES "")
|
||||
endif()
|
||||
|
||||
if(NOT LIBOSMODSP_FOUND)
|
||||
message(STATUS "libosmodsp not found, using local checkout")
|
||||
set(LIBOSMODSP_SEL_INCLUDE_DIRS ${FFTW3f_INCLUDE_DIRS} "libosmo-dsp/include/")
|
||||
set(LIBOSMODSP_SEL_INCLUDE_DIRS ${FFTW3f_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/include/")
|
||||
set(LIBOSMODSP_SEL_LIBRARIES ${FFTW3f_LIBRARIES})
|
||||
set(LIBOSMODSP_SEL_LIBRARY_DIRS ${FFTW3f_LIBRARY_DIRS})
|
||||
set(LIBOSMODSP_SEL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/cxvec.c ${CMAKE_CURRENT_SOURCE_DIR}/libosmo-dsp/src/iqbal.c)
|
||||
endif()
|
||||
|
||||
|
|
@ -123,19 +116,12 @@ if(NOT CMAKE_MODULES_DIR)
|
|||
set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
|
||||
endif(NOT CMAKE_MODULES_DIR)
|
||||
|
||||
set(GR_RUNTIME_DIR bin)
|
||||
set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
|
||||
set(GR_INCLUDE_DIR include)
|
||||
SET(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/gr-iqbal)
|
||||
set(GR_DATA_DIR share)
|
||||
set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/gnuradio)
|
||||
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
|
||||
set(GR_DOC_DIR ${GR_DATA_DIR}/doc)
|
||||
set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
|
||||
set(GR_CONF_DIR etc)
|
||||
set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
|
||||
set(GR_LIBEXEC_DIR libexec)
|
||||
set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
|
||||
set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
|
||||
|
||||
########################################################################
|
||||
# On Apple only, set install name and use rpath correctly, if not already set
|
||||
|
|
@ -163,24 +149,13 @@ endif(APPLE)
|
|||
find_package(Doxygen)
|
||||
|
||||
########################################################################
|
||||
# Setup the include and linker paths
|
||||
# Setup doxygen option
|
||||
########################################################################
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${LIBOSMODSP_SEL_INCLUDE_DIRS}
|
||||
${GNURADIO_ALL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
link_directories(
|
||||
${Boost_LIBRARY_DIRS}
|
||||
${LIBOSMODSP_SEL_LIBRARY_DIRS}
|
||||
${GNURADIO_ALL_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
# Set component parameters
|
||||
set(GR_IQBALANCE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE)
|
||||
set(GR_IQBALANCE_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE)
|
||||
if(DOXYGEN_FOUND)
|
||||
option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
|
||||
else(DOXYGEN_FOUND)
|
||||
option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
|
||||
endif(DOXYGEN_FOUND)
|
||||
|
||||
########################################################################
|
||||
# Create uninstall target
|
||||
|
|
@ -199,15 +174,8 @@ add_custom_target(uninstall
|
|||
########################################################################
|
||||
add_subdirectory(include/gnuradio/iqbalance)
|
||||
add_subdirectory(lib)
|
||||
add_subdirectory(apps)
|
||||
add_subdirectory(docs)
|
||||
add_subdirectory(swig)
|
||||
add_subdirectory(python)
|
||||
add_subdirectory(grc)
|
||||
add_subdirectory(apps)
|
||||
add_subdirectory(docs)
|
||||
|
||||
########################################################################
|
||||
# Install cmake search helper for this library
|
||||
########################################################################
|
||||
#install(FILES cmake/Modules/gnuradio-iqbalanceConfig.cmake
|
||||
# DESTINATION ${CMAKE_MODULES_DIR}/gnuradio-iqbalance
|
||||
#)
|
||||
|
|
|
|||
|
|
@ -30,10 +30,11 @@ list(APPEND iqbalance_sources
|
|||
add_library(gnuradio-iqbalance SHARED ${iqbalance_sources} ${LIBOSMODSP_SEL_SOURCES})
|
||||
target_link_libraries(gnuradio-iqbalance gnuradio::gnuradio-runtime ${LIBOSMODSP_SEL_LIBRARIES})
|
||||
target_include_directories(gnuradio-iqbalance
|
||||
PRIVATE ${LIBOSMODSP_SEL_INCLUDE_DIRS}
|
||||
PUBLIC ${Boost_INCLUDE_DIRS}
|
||||
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
||||
PUBLIC $<INSTALL_INTERFACE:include>
|
||||
)
|
||||
set_target_properties(gnuradio-iqbalance PROPERTIES OUTPUT_NAME gnuradio-iqbalance)
|
||||
set_target_properties(gnuradio-iqbalance PROPERTIES DEFINE_SYMBOL "gnuradio_iqbalance_EXPORTS")
|
||||
|
||||
if(APPLE)
|
||||
|
|
@ -46,8 +47,6 @@ endif(APPLE)
|
|||
# Install built library files
|
||||
########################################################################
|
||||
include(GrMiscUtils)
|
||||
set(VERSION "3.8.0")
|
||||
set(LIBVER "3.8.0")
|
||||
GR_LIBRARY_FOO(gnuradio-iqbalance)
|
||||
|
||||
########################################################################
|
||||
|
|
@ -59,9 +58,23 @@ message(STATUS "Building for version: ${VERSION} / ${LIBVER}")
|
|||
########################################################################
|
||||
# Build and register unit test
|
||||
########################################################################
|
||||
find_package(Boost COMPONENTS unit_test_framework)
|
||||
|
||||
include(GrTest)
|
||||
list(APPEND GR_TEST_TARGET_DEPS gnuradio-iqbalance)
|
||||
#turn each test cpp file into an executable with an int main() function
|
||||
add_definitions(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
|
||||
|
||||
# If your unit tests require special include paths, add them here
|
||||
#include_directories()
|
||||
# List all files that contain Boost.UTF unit tests here
|
||||
list(APPEND iqbalance_test_sources
|
||||
)
|
||||
# Anything we need to link to for the unit tests go here
|
||||
list(APPEND GR_TEST_TARGET_DEPS gnuradio-test)
|
||||
|
||||
if(NOT iqbalance_test_sources)
|
||||
MESSAGE(STATUS "No C++ unit tests... skipping")
|
||||
return()
|
||||
endif(NOT iqbalance_test_sources)
|
||||
|
||||
foreach(qa_file ${iqbalance_test_sources})
|
||||
GR_ADD_CPP_TEST("test_${qa_file}"
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/${qa_file}
|
||||
)
|
||||
endforeach(qa_file)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ set(GR_SWIG_LIBRARIES gnuradio-iqbalance)
|
|||
|
||||
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/iqbalance_swig_doc.i)
|
||||
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/iqbalance)
|
||||
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
|
||||
|
||||
GR_SWIG_MAKE(iqbalance_swig iqbalance_swig.i)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue