From 0006d4248591eae8a2dc58bff19aa4c6bc44f584 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 19 Oct 2022 10:19:53 +0200 Subject: [PATCH] Restore Debian (Ubuntu) build and do not use precompiled libraries for Linux --- .appveyor.yml | 2 +- debian/rules | 2 +- external/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index daf5a56d1..58c14c04c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -28,7 +28,7 @@ environment: CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \ -DARCH_OPT=nehalem \ -DDEBUG_OUTPUT=ON \ - -DENABLE_EXTERNAL_LIBRARIES=AUTO \ + -DENABLE_EXTERNAL_LIBRARIES=ON \ -DBUILD_SERVER=OFF" - TARGET: ubuntu2204docker APPVEYOR_BUILD_WORKER_CLOUD: nasrock diff --git a/debian/rules b/debian/rules index da185a490..1a04209de 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ dh $@ --parallel --buildsystem=cmake+ninja override_dh_auto_configure: - dh_auto_configure -- -DARCH_OPT=nehalem -DENABLE_EXTERNAL_LIBRARIES=AUTO -DDEBUG_OUTPUT=ON -DBUILD_SERVER=OFF + dh_auto_configure -- -DARCH_OPT=nehalem -DENABLE_EXTERNAL_LIBRARIES=ON -DDEBUG_OUTPUT=ON -DBUILD_SERVER=OFF override_dh_auto_test: echo "Skipping test step" diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 941c59f4f..76ed0945f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -201,8 +201,7 @@ endif (AUTO_EXTERNAL_LIBRARIES) # Some of the following projects are currently built only for MacOS # For WIN32, we use precompiled versions from sdrangel-windows-libraries -# For LINUX, we require system pacakges to be installed -if (APPLE) +if (APPLE OR LINUX) set(USE_PRECOMPILED_LIBS FALSE) else() set(USE_PRECOMPILED_LIBS TRUE) @@ -1478,4 +1477,3 @@ endif (WIN32 OR APPLE) # Set CACHE so variable is visible in cpack CMakeFile set(MACOS_EXTERNAL_LIBS_FIXUP ${MACOS_EXTERNAL_LIBS_FIXUP} CACHE INTERNAL "") -