From a9d92d3a8e55719b6dcf1165de21baa71f6c3691 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sun, 3 Oct 2021 02:04:02 +0200 Subject: [PATCH] More fixes + debugging macos ci --- .github/workflows/build_all.yml | 2 +- CMakeLists.txt | 2 +- airspy_source/CMakeLists.txt | 2 +- airspyhf_source/CMakeLists.txt | 2 +- audio_sink/CMakeLists.txt | 2 +- bladerf_source/CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- demo_module/CMakeLists.txt | 2 +- discord_integration/CMakeLists.txt | 2 +- falcon9_decoder/CMakeLists.txt | 2 +- file_source/CMakeLists.txt | 2 +- frequency_manager/CMakeLists.txt | 2 +- hackrf_source/CMakeLists.txt | 2 +- limesdr_source/CMakeLists.txt | 2 +- m17_decoder/CMakeLists.txt | 2 +- meteor_demodulator/CMakeLists.txt | 2 +- network_sink/CMakeLists.txt | 2 +- new_portaudio_sink/CMakeLists.txt | 2 +- plutosdr_source/CMakeLists.txt | 2 +- portaudio_sink/CMakeLists.txt | 2 +- radio/CMakeLists.txt | 2 +- recorder/CMakeLists.txt | 2 +- rigctl_server/CMakeLists.txt | 2 +- rtl_sdr_source/CMakeLists.txt | 2 +- rtl_tcp_source/CMakeLists.txt | 2 +- scanner/CMakeLists.txt | 2 +- sddc_source/CMakeLists.txt | 2 +- sdrplay_source/CMakeLists.txt | 2 +- soapy_source/CMakeLists.txt | 2 +- spyserver_source/CMakeLists.txt | 2 +- weather_sat_decoder/CMakeLists.txt | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 10aa96bf..34b9b105 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -95,7 +95,7 @@ jobs: - name: Build working-directory: ${{runner.workspace}}/build - run: make -j3 + run: make VERBOSE=1 -j3 - name: Create Archive working-directory: ${{runner.workspace}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dfd699a..bce456b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with softwa # Compiler arguments for each platform if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index 2c277b9d..4def73a9 100644 --- a/airspy_source/CMakeLists.txt +++ b/airspy_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(airspy_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index e978bb09..83f20577 100644 --- a/airspyhf_source/CMakeLists.txt +++ b/airspyhf_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(airspyhf_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index b12fe065..66914315 100644 --- a/audio_sink/CMakeLists.txt +++ b/audio_sink/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(audio_sink) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/bladerf_source/CMakeLists.txt b/bladerf_source/CMakeLists.txt index 2d2501e4..2c6bd8c2 100644 --- a/bladerf_source/CMakeLists.txt +++ b/bladerf_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(bladerf_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ba8ddbb4..06a3fa55 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -5,7 +5,7 @@ add_subdirectory("libcorrect/") # Set compiler options if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) diff --git a/demo_module/CMakeLists.txt b/demo_module/CMakeLists.txt index e3cdc25e..d27f5a4b 100644 --- a/demo_module/CMakeLists.txt +++ b/demo_module/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(demo) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/discord_integration/CMakeLists.txt b/discord_integration/CMakeLists.txt index 1cf661e1..50defffe 100644 --- a/discord_integration/CMakeLists.txt +++ b/discord_integration/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(discord_integration) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup -fPIC) else () diff --git a/falcon9_decoder/CMakeLists.txt b/falcon9_decoder/CMakeLists.txt index 2ddcce9a..b8a0349c 100644 --- a/falcon9_decoder/CMakeLists.txt +++ b/falcon9_decoder/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(falcon9_decoder) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/file_source/CMakeLists.txt b/file_source/CMakeLists.txt index a30673f8..1ab0316b 100644 --- a/file_source/CMakeLists.txt +++ b/file_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(file_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/frequency_manager/CMakeLists.txt b/frequency_manager/CMakeLists.txt index dfd3c101..83304f5b 100644 --- a/frequency_manager/CMakeLists.txt +++ b/frequency_manager/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(frequency_manager) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index 3b9d1eea..8070ea2b 100644 --- a/hackrf_source/CMakeLists.txt +++ b/hackrf_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(hackrf_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/limesdr_source/CMakeLists.txt b/limesdr_source/CMakeLists.txt index 1019a766..50c3fd18 100644 --- a/limesdr_source/CMakeLists.txt +++ b/limesdr_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(limesdr_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/m17_decoder/CMakeLists.txt b/m17_decoder/CMakeLists.txt index 3e9ec747..bfda3a3b 100644 --- a/m17_decoder/CMakeLists.txt +++ b/m17_decoder/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(m17_decoder) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/meteor_demodulator/CMakeLists.txt b/meteor_demodulator/CMakeLists.txt index 1875eb3c..336b51d4 100644 --- a/meteor_demodulator/CMakeLists.txt +++ b/meteor_demodulator/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(meteor_demodulator) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/network_sink/CMakeLists.txt b/network_sink/CMakeLists.txt index 5473374d..a4acffbd 100644 --- a/network_sink/CMakeLists.txt +++ b/network_sink/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(network_sink) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/new_portaudio_sink/CMakeLists.txt b/new_portaudio_sink/CMakeLists.txt index 9adfa574..b5dc945d 100644 --- a/new_portaudio_sink/CMakeLists.txt +++ b/new_portaudio_sink/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(new_portaudio_sink) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index ef6c048b..039e59b1 100644 --- a/plutosdr_source/CMakeLists.txt +++ b/plutosdr_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(plutosdr_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/portaudio_sink/CMakeLists.txt b/portaudio_sink/CMakeLists.txt index f2558168..15a0e210 100644 --- a/portaudio_sink/CMakeLists.txt +++ b/portaudio_sink/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(audio_sink) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt index a99136ae..1707b91e 100644 --- a/radio/CMakeLists.txt +++ b/radio/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(radio) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/recorder/CMakeLists.txt b/recorder/CMakeLists.txt index 1b8d56c6..97f363a6 100644 --- a/recorder/CMakeLists.txt +++ b/recorder/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(recorder) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/rigctl_server/CMakeLists.txt b/rigctl_server/CMakeLists.txt index f50085b7..75609b9e 100644 --- a/rigctl_server/CMakeLists.txt +++ b/rigctl_server/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(rigctl_server) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index 1dbf7c7d..0d6f6b1f 100644 --- a/rtl_sdr_source/CMakeLists.txt +++ b/rtl_sdr_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(rtl_sdr_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/rtl_tcp_source/CMakeLists.txt b/rtl_tcp_source/CMakeLists.txt index d968f453..0ee9291f 100644 --- a/rtl_tcp_source/CMakeLists.txt +++ b/rtl_tcp_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(rtl_tcp_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/scanner/CMakeLists.txt b/scanner/CMakeLists.txt index 804fac0a..17cdefe8 100644 --- a/scanner/CMakeLists.txt +++ b/scanner/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(scanner) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/sddc_source/CMakeLists.txt b/sddc_source/CMakeLists.txt index a74e268a..42cdc8c0 100644 --- a/sddc_source/CMakeLists.txt +++ b/sddc_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(sddc_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/sdrplay_source/CMakeLists.txt b/sdrplay_source/CMakeLists.txt index 9cbe4fba..8e2c6ef4 100644 --- a/sdrplay_source/CMakeLists.txt +++ b/sdrplay_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(sdrplay_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index dfffb0af..af31578b 100644 --- a/soapy_source/CMakeLists.txt +++ b/soapy_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(soapy_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/spyserver_source/CMakeLists.txt b/spyserver_source/CMakeLists.txt index 28bd1ec2..f82e19c9 100644 --- a/spyserver_source/CMakeLists.txt +++ b/spyserver_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(spyserver_source) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () diff --git a/weather_sat_decoder/CMakeLists.txt b/weather_sat_decoder/CMakeLists.txt index 0f1e296d..4dffa849 100644 --- a/weather_sat_decoder/CMakeLists.txt +++ b/weather_sat_decoder/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(weather_sat_decoder) if (MSVC) - add_compile_options(/O2 /std:c++17 /EHsc) + add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else ()