From 04a62b813ffd8e143554141d3394107f8a016957 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 28 Jun 2019 09:32:46 +0200 Subject: [PATCH] Remove unused CMake modules Move ENABLE_GNSS_SIM_INSTALL option to main CMakeLisis.txt file Remove unused lines Update Doxygen download website --- CMakeLists.txt | 10 +- cmake/Modules/FindLIBOSMOSDR.cmake | 98 ------------------- cmake/Modules/FindOPENBLAS.cmake | 49 ---------- cmake/Modules/TestForSSE.cmake | 55 ----------- .../signal_source/adapters/CMakeLists.txt | 2 - src/tests/CMakeLists.txt | 4 +- 6 files changed, 10 insertions(+), 208 deletions(-) delete mode 100644 cmake/Modules/FindLIBOSMOSDR.cmake delete mode 100644 cmake/Modules/FindOPENBLAS.cmake delete mode 100644 cmake/Modules/TestForSSE.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 05207272c..0b3d443cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,9 +97,16 @@ option(ENABLE_SYSTEM_TESTING "Build system tests" OFF) option(ENABLE_SYSTEM_TESTING_EXTRA "Download external tools and build extra system tests" OFF) +option(ENABLE_GNSS_SIM_INSTALL "Enable the installation of gnss_sim on the fly" ON) + +if(NOT (ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)) + set(ENABLE_GNSS_SIM_INSTALL OFF) +endif() + if(ENABLE_SYSTEM_TESTING_EXTRA) set(ENABLE_SYSTEM_TESTING ON) endif() + option(ENABLE_OWN_GPSTK "Force to download, build and link GPSTk for system tests, even if it is already installed" OFF) option(ENABLE_INSTALL_TESTS "Install QA code system-wide" OFF) @@ -2026,7 +2033,7 @@ if(DOXYGEN_FOUND) else() message(STATUS " Doxygen has not been found in your system.") message(STATUS " You can get nice code documentation by using it!") - message(STATUS " Get it from http://www.stack.nl/~dimitri/doxygen/index.html") + message(STATUS " Get it from http://www.doxygen.nl/download.html") if(OS_IS_LINUX) if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") message(STATUS " or simply by doing 'sudo yum install doxygen-latex'.") @@ -2466,6 +2473,7 @@ add_feature_info(ENABLE_UNIT_TESTING_EXTRA ENABLE_UNIT_TESTING_EXTRA "Enables bu add_feature_info(ENABLE_SYSTEM_TESTING ENABLE_SYSTEM_TESTING "Enables building of System Tests.") add_feature_info(ENABLE_SYSTEM_TESTING_EXTRA ENABLE_SYSTEM_TESTING_EXTRA "Enables building of Extra System Tests and downloading of external tools.") add_feature_info(ENABLE_OWN_GPSTK ENABLE_OWN_GPSTK "Forces the downloading and building of GPSTk for system tests.") +add_feature_info(ENABLE_GNSS_SIM_INSTALL ENABLE_GNSS_SIM_INSTALL "Enables downloading and building of gnss-sim.") add_feature_info(ENABLE_INSTALL_TESTS ENABLE_INSTALL_TESTS "Install test binaries when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} install'.") message(STATUS "") diff --git a/cmake/Modules/FindLIBOSMOSDR.cmake b/cmake/Modules/FindLIBOSMOSDR.cmake deleted file mode 100644 index 7ecf41a61..000000000 --- a/cmake/Modules/FindLIBOSMOSDR.cmake +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) -# -# This file is part of GNSS-SDR. -# -# GNSS-SDR is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GNSS-SDR is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNSS-SDR. If not, see . - -# Tries to find libosmosdr. -# -# Usage of this module as follows: -# -# find_package(LIBOSMOSDR) -# -# -# Variables defined by this module: -# -# LIBOSMOSDR_FOUND System has libosmosdr libs/headers -# LIBOSMOSDR_LIBRARIES The libosmosdr libraries -# LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers -# -# Provides the following imported target: -# Osmosdr::osmosdr -# - -set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) -include(FindPkgConfig) -pkg_check_modules(LIBOSMOSDR_PKG libosmosdr) - -find_path(LIBOSMOSDR_INCLUDE_DIR NAMES osmosdr.h - PATHS - ${LIBOSMOSDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include - ${LIBOSMOSDR_ROOT}/include - $ENV{LIBOSMOSDR_ROOT}/include - ${LIBOSMOSDR_PKG_INCLUDEDIR} -) - -find_library(LIBOSMOSDR_LIBRARIES NAMES osmosdr - PATHS - ${LIBOSMOSDR_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - /usr/lib/x86_64-linux-gnu - /usr/lib/i386-linux-gnu - /usr/lib/arm-linux-gnueabihf - /usr/lib/arm-linux-gnueabi - /usr/lib/aarch64-linux-gnu - /usr/lib/mipsel-linux-gnu - /usr/lib/mips-linux-gnu - /usr/lib/mips64el-linux-gnuabi64 - /usr/lib/powerpc-linux-gnu - /usr/lib/powerpc64-linux-gnu - /usr/lib/powerpc64le-linux-gnu - /usr/lib/powerpc-linux-gnuspe - /usr/lib/hppa-linux-gnu - /usr/lib/s390x-linux-gnu - /usr/lib/i386-gnu - /usr/lib/hppa-linux-gnu - /usr/lib/x86_64-kfreebsd-gnu - /usr/lib/i386-kfreebsd-gnu - /usr/lib/m68k-linux-gnu - /usr/lib/sh4-linux-gnu - /usr/lib/sparc64-linux-gnu - /usr/lib/x86_64-linux-gnux32 - /usr/lib/alpha-linux-gnu - /usr/lib64 - ${LIBOSMOSDR_ROOT}/lib - $ENV{LIBOSMOSDR_ROOT}/lib - ${LIBOSMOSDR_ROOT}/lib64 - $ENV{LIBOSMOSDR_ROOT}/lib64 - ${LIBOSMOSDR_PKG_LIBDIR} -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LIBOSMOSDR DEFAULT_MSG LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES) - -if(LIBOSMOSDR_FOUND AND NOT TARGET Osmosdr::osmosdr) - add_library(Osmosdr::osmosdr SHARED IMPORTED) - set_target_properties(Osmosdr::osmosdr PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${LIBOSMOSDR_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${LIBOSMOSDR_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "${LIBOSMOSDR_LIBRARIES}" - ) -endif() - -mark_as_advanced(LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES) diff --git a/cmake/Modules/FindOPENBLAS.cmake b/cmake/Modules/FindOPENBLAS.cmake deleted file mode 100644 index 8ff70d65f..000000000 --- a/cmake/Modules/FindOPENBLAS.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) -# -# This file is part of GNSS-SDR. -# -# GNSS-SDR is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GNSS-SDR is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNSS-SDR. If not, see . - -# - Try to find OpenBLAS library (not headers!) -# -# The following environment variable is optionally searched -# OPENBLAS_HOME: Base directory where all OpenBlas components are found - -set(OPEN_BLAS_SEARCH_PATHS - /lib - /lib64/ - /usr/lib - /usr/lib64 - /usr/local/lib - /usr/local/lib64 - /opt/OpenBLAS/lib - /opt/local/lib - /usr/lib/openblas-base - $ENV{OPENBLAS_HOME}/lib - ${OPENBLAS_ROOT}/lib - $ENV{OPENBLAS_ROOT}/lib - ${OPENBLAS_ROOT}/lib64 - $ENV{OPENBLAS_ROOT}/lib64 -) - -find_library(OPENBLAS NAMES openblas PATHS ${OPEN_BLAS_SEARCH_PATHS}) - -if(OPENBLAS) - set(OPENBLAS_FOUND ON) - message(STATUS "Found OpenBLAS") -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(OPENBLAS DEFAULT_MSG OPENBLAS) -mark_as_advanced(OPENBLAS) diff --git a/cmake/Modules/TestForSSE.cmake b/cmake/Modules/TestForSSE.cmake deleted file mode 100644 index 23b2d16a8..000000000 --- a/cmake/Modules/TestForSSE.cmake +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) -# -# This file is part of GNSS-SDR. -# -# GNSS-SDR is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GNSS-SDR is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNSS-SDR. If not, see . - - -############################################################################### -# Test for availability of SSE -# -# - Anthony Arnold -############################################################################### - -function(test_for_sse h_file result_var name) - if(NOT DEFINED ${result_var}) - execute_process(COMMAND echo "#include <${h_file}>" - COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} -c -x c++ - - RESULT_VARIABLE COMPILE_RESULT - OUTPUT_QUIET ERROR_QUIET) - set(detected 0) - if(COMPILE_RESULT EQUAL 0) - message(STATUS "Detected ${name}") - set(detected 1) - endif() - set(${result_var} ${detected} CACHE INTERNAL "${name} Available") - endif() -endfunction() - -message(STATUS "Testing for SIMD extensions") - -enable_language(C) - -test_for_sse("ammintrin.h" SSE4A_AVAILABLE "SSE4A") -test_for_sse("nmmintrin.h" SSE4_2_AVAILABLE "SSE4.2") -test_for_sse("smmintrin.h" SSE4_1_AVAILABLE "SSE4.1") -test_for_sse("tmmintrin.h" SSSE3_AVAILABLE "SSSE3") -test_for_sse("pmmintrin.h" SSE3_AVAILABLE "SSE3") -test_for_sse("emmintrin.h" SSE2_AVAILABLE "SSE2") -test_for_sse("xmmintrin.h" SSE_AVAILABLE "SSE1") -test_for_sse("mmintrin.h" MMX_AVAILABLE "MMX") -test_for_sse("wmmintrin.h" AES_AVAILABLE "AES") -test_for_sse("immintrin.h" AVX_AVAILABLE "AVX") - -file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/-.o") diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index e9cba3c93..1cb23518b 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -103,8 +103,6 @@ if(ENABLE_ARRAY) message(" gr-dbfcttc not found, install it from https://github.com/gnss-sdr/gr-dbfcttc ") message(FATAL_ERROR "gr-dbfcttc required for building gnss-sdr with this option enabled") endif() - set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_DBFCTTC_LIBRARIES}) - set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_DBFCTTC_INCLUDE_DIRS}) set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc) set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} raw_array_signal_source.h) endif() diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index e3bde0ee9..5259370d2 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -191,10 +191,8 @@ endif() ################################################################################ -# Optional generator +# GPSTk and optional generator ################################################################################ -option(ENABLE_GNSS_SIM_INSTALL "Enable the installation of gnss_sim on the fly" ON) -add_feature_info(ENABLE_GNSS_SIM_INSTALL ENABLE_GNSS_SIM_INSTALL "Enables downloading and building of gnss-sim.") find_package(GPSTK) set_package_properties(GPSTK PROPERTIES