From da02757a07a36a76597901faec0347a656727396 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 26 Jun 2019 21:07:59 +0200 Subject: [PATCH 1/3] Minor editing --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d50156211..8434be966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -677,11 +677,11 @@ set_package_properties(Boost PROPERTIES if(CMAKE_VERSION VERSION_GREATER 3.14) set_package_properties(Boost PROPERTIES - DESCRIPTION "Portable C++ source libraries (found: ${Boost_VERSION_STRING})" + DESCRIPTION "Portable C++ source libraries (found: v${Boost_VERSION_STRING})" ) else() set_package_properties(Boost PROPERTIES - DESCRIPTION "Portable C++ source libraries (found: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})" + DESCRIPTION "Portable C++ source libraries (found: v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})" ) endif() @@ -841,7 +841,7 @@ if(NOT VOLKGNSSSDR_FOUND) ) if(Python3_FOUND) set_package_properties(Python3 PROPERTIES - DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python3_VERSION})" + DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${Python3_VERSION})" ) else() set_package_properties(Python3 PROPERTIES @@ -852,7 +852,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(Python2_FOUND) set_package_properties(Python2 PROPERTIES URL "https://www.python.org/" - DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python2_VERSION})" + DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${Python2_VERSION})" PURPOSE "Required to build volk_gnsssdr." TYPE REQUIRED ) @@ -862,7 +862,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(PYTHONINTERP_FOUND) set_package_properties(PythonInterp PROPERTIES URL "https://www.python.org/" - DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${PYTHON_VERSION_STRING})" + DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${PYTHON_VERSION_STRING})" PURPOSE "Required to build volk_gnsssdr." TYPE REQUIRED ) @@ -1529,7 +1529,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS ) if(ZLIB_FOUND AND ZLIB_VERSION_STRING) set_package_properties(ZLIB PROPERTIES - DESCRIPTION "A Massively Spiffy Yet Delicately Unobtrusive Compression Library (found: ${ZLIB_VERSION_STRING})" + DESCRIPTION "A Massively Spiffy Yet Delicately Unobtrusive Compression Library (found: v${ZLIB_VERSION_STRING})" ) else() set_package_properties(ZLIB PROPERTIES @@ -1580,7 +1580,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS ) if(HDF5_FOUND AND HDF5_VERSION) set_package_properties(HDF5 PROPERTIES - DESCRIPTION "A versatile data model, a portable file format and a software library (found: ${HDF5_VERSION})" + DESCRIPTION "A versatile data model, a portable file format and a software library (found: v${HDF5_VERSION})" ) else() set_package_properties(HDF5 PROPERTIES From b19fad4b634571bd05136fc6295ce22cb319ba60 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 26 Jun 2019 23:20:12 +0200 Subject: [PATCH 2/3] Minor editing --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8434be966..05207272c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -808,7 +808,7 @@ if(NOT VOLKGNSSSDR_FOUND) # Mako if(NOT MAKO_FOUND) - message(STATUS "Mako template library not found. See http://www.makotemplates.org/ ") + message(STATUS "Mako template library not found. See http://www.makotemplates.org/") message(STATUS " You can try to install it by typing:") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") message(STATUS " sudo yum install ${PYTHON_NAME}-mako") @@ -822,7 +822,7 @@ if(NOT VOLKGNSSSDR_FOUND) # Six if(NOT SIX_FOUND) - message(STATUS "python-six not found. See https://pythonhosted.org/six/ ") + message(STATUS "python-six not found. See https://pythonhosted.org/six/") message(STATUS " You can try to install it by typing:") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") message(STATUS " sudo yum install ${PYTHON_NAME}-six") @@ -1000,7 +1000,7 @@ set_package_properties(GFLAGS PROPERTIES ) if(NOT GFLAGS_FOUND) message(STATUS " gflags library has not been found.") - message(STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically ") + message(STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically") message(STATUS " when doing 'make'.") if(CMAKE_VERSION VERSION_LESS 3.2) @@ -1079,7 +1079,7 @@ if(NOT GLOG_FOUND OR ${LOCAL_GFLAGS}) if(NOT GFLAGS_FOUND) message(STATUS " or it is likely not linked to gflags.") endif() - message(STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically ") + message(STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically") message(STATUS " when doing 'make'.") if(NOT ${LOCAL_GFLAGS}) add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED) @@ -2059,7 +2059,7 @@ if(ENABLE_OPENCL) else() if(OPENCL_FOUND) message(STATUS "OpenCL has been found and will be used by some processing blocks") - message(STATUS " You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ..' ") + message(STATUS " You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ..'") endif() endif() if(ENABLE_GENERIC_ARCH) From 52b70af104d9425cc883117ee29e0adaea151506 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 27 Jun 2019 08:47:09 +0200 Subject: [PATCH 3/3] Preserve PACKAGE_VERSION variable if it exists --- cmake/Modules/FindGFLAGS.cmake | 4 +++- cmake/Modules/FindGNURADIO.cmake | 4 +++- cmake/Modules/FindGPSTK.cmake | 4 +++- cmake/Modules/FindTELEORBIT.cmake | 4 +++- cmake/Modules/FindUHD.cmake | 4 +++- cmake/Modules/FindVOLK.cmake | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake index e4d2c204d..91e33411b 100644 --- a/cmake/Modules/FindGFLAGS.cmake +++ b/cmake/Modules/FindGFLAGS.cmake @@ -117,6 +117,8 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GFLAGS DEFAULT_MSG GFlags_LIBS GFlags_INCLUDE_DIRS) if(GFLAGS_FOUND) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) list(GET GFlags_LIBS 0 FIRST_DIR) get_filename_component(GFlags_LIBS_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${GFlags_LIBS_DIR}/cmake/gflags/gflags-config-version.cmake) @@ -132,7 +134,7 @@ if(GFLAGS_FOUND) DESCRIPTION "C++ library that implements commandline flags processing" ) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) else() set_package_properties(GFLAGS PROPERTIES DESCRIPTION "C++ library that implements commandline flags processing" diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index 11e173fc9..708590894 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -187,6 +187,8 @@ list(REMOVE_DUPLICATES GNURADIO_ALL_INCLUDE_DIRS) list(REMOVE_DUPLICATES GNURADIO_ALL_LIBRARIES) if(NOT PC_GNURADIO_RUNTIME_VERSION) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) list(GET GNURADIO_BLOCKS_LIBRARIES 0 FIRST_DIR) get_filename_component(GNURADIO_BLOCKS_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${GNURADIO_BLOCKS_DIR}/cmake/gnuradio/GnuradioConfigVersion.cmake) @@ -198,7 +200,7 @@ if(NOT PC_GNURADIO_RUNTIME_VERSION) if(PACKAGE_VERSION) set(PC_GNURADIO_RUNTIME_VERSION ${PACKAGE_VERSION}) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) endif() # Trick to find out that GNU Radio is >= 3.7.4 if pkgconfig is not present diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake index 5d7d1bb7a..65814c635 100644 --- a/cmake/Modules/FindGPSTK.cmake +++ b/cmake/Modules/FindGPSTK.cmake @@ -54,13 +54,15 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR) if(GPSTK_FOUND) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) if(EXISTS ${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake) include(${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake) endif() if(PACKAGE_VERSION) set(GPSTK_VERSION ${PACKAGE_VERSION}) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) endif() if(GPSTK_FOUND AND GPSTK_VERSION) diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index cc33ac87b..e26f54c60 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -60,6 +60,8 @@ if(PC_TELEORBIT_VERSION) endif() if(NOT TELEORBIT_VERSION) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) list(GET TELEORBIT_LIBRARIES 0 FIRST_DIR) get_filename_component(TELEORBIT_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake) @@ -68,7 +70,7 @@ if(NOT TELEORBIT_VERSION) if(PACKAGE_VERSION) set(TELEORBIT_VERSION ${PACKAGE_VERSION}) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) endif() if(TELEORBIT_FOUND AND TELEORBIT_VERSION) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index b75532472..57379d6f2 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -86,6 +86,8 @@ if(PC_UHD_VERSION) set(UHD_VERSION ${PC_UHD_VERSION}) endif() if(NOT PC_UHD_VERSION) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) list(GET UHD_LIBRARIES 0 FIRST_DIR) get_filename_component(UHD_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${UHD_LIBRARIES_DIR}/cmake/uhd/UHDConfigVersion.cmake) @@ -94,7 +96,7 @@ if(NOT PC_UHD_VERSION) if(PACKAGE_VERSION) set(UHD_VERSION ${PACKAGE_VERSION}) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) endif() set_package_properties(UHD PROPERTIES diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake index fc35ebdff..16dbe96c5 100644 --- a/cmake/Modules/FindVOLK.cmake +++ b/cmake/Modules/FindVOLK.cmake @@ -88,6 +88,8 @@ if(PC_VOLK_VERSION) endif() if(NOT VOLK_VERSION) + set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION}) + unset(PACKAGE_VERSION) list(GET VOLK_LIBRARIES 0 FIRST_DIR) get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY) if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) @@ -96,7 +98,7 @@ if(NOT VOLK_VERSION) if(PACKAGE_VERSION) set(VOLK_VERSION ${PACKAGE_VERSION}) endif() - unset(PACKAGE_VERSION) + set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION}) endif() set_package_properties(VOLK PROPERTIES