VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Restore Debian (Ubuntu) build and do not use precompiled libraries for Linux

Browse Source
This commit is contained in:
f4exb 2022-10-19 10:19:53 +02:00
parent 8c42caddce
commit 0006d42485
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -28,7 +28,7 @@ environment:
CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \ CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
-DARCH_OPT=nehalem \ -DARCH_OPT=nehalem \
-DDEBUG_OUTPUT=ON \ -DDEBUG_OUTPUT=ON \
-DENABLE_EXTERNAL_LIBRARIES=AUTO \ -DENABLE_EXTERNAL_LIBRARIES=ON \
-DBUILD_SERVER=OFF" -DBUILD_SERVER=OFF"
- TARGET: ubuntu2204docker - TARGET: ubuntu2204docker
APPVEYOR_BUILD_WORKER_CLOUD: nasrock APPVEYOR_BUILD_WORKER_CLOUD: nasrock

2
debian/rules vendored
View File

@ -3,7 +3,7 @@
dh $@ --parallel --buildsystem=cmake+ninja dh $@ --parallel --buildsystem=cmake+ninja
override_dh_auto_configure: 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: override_dh_auto_test:
echo "Skipping test step" echo "Skipping test step"

4
external/CMakeLists.txt vendored
View File

@ -201,8 +201,7 @@ endif (AUTO_EXTERNAL_LIBRARIES)
# Some of the following projects are currently built only for MacOS # Some of the following projects are currently built only for MacOS
# For WIN32, we use precompiled versions from sdrangel-windows-libraries # For WIN32, we use precompiled versions from sdrangel-windows-libraries
# For LINUX, we require system pacakges to be installed if (APPLE OR LINUX)
if (APPLE)
set(USE_PRECOMPILED_LIBS FALSE) set(USE_PRECOMPILED_LIBS FALSE)
else() else()
set(USE_PRECOMPILED_LIBS TRUE) set(USE_PRECOMPILED_LIBS TRUE)
@ -1478,4 +1477,3 @@ endif (WIN32 OR APPLE)
# Set CACHE so variable is visible in cpack CMakeFile # Set CACHE so variable is visible in cpack CMakeFile
set(MACOS_EXTERNAL_LIBS_FIXUP ${MACOS_EXTERNAL_LIBS_FIXUP} CACHE INTERNAL "") set(MACOS_EXTERNAL_LIBS_FIXUP ${MACOS_EXTERNAL_LIBS_FIXUP} CACHE INTERNAL "")