mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Corrections to CI/CD for GGMorse
This commit is contained in:
parent
ead45bdadd
commit
a382ebc23a
2
.github/workflows/sdrangel.yml
vendored
2
.github/workflows/sdrangel.yml
vendored
@ -81,7 +81,7 @@ jobs:
|
||||
cmd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
choco install patch
|
||||
mkdir build && cd build
|
||||
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DENABLE_FEATURE_MORSEDECODER=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
|
||||
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
|
||||
cmake --build . --config Release --target package
|
||||
- name: Check disk space
|
||||
run: Get-PSDrive
|
||||
|
3
external/CMakeLists.txt
vendored
3
external/CMakeLists.txt
vendored
@ -864,6 +864,7 @@ if(ENABLE_FEATURE_MORSEDECODER)
|
||||
CMAKE_ARGS ${COMMON_CMAKE_ARGS}
|
||||
-DGGMORSE_BUILD_TESTS=OFF
|
||||
-DGGMORSE_BUILD_EXAMPLES=OFF
|
||||
-D_USE_MATH_DEFINES
|
||||
BUILD_BYPRODUCTS "${GGMORSE_LIBRARIES}"
|
||||
INSTALL_COMMAND ""
|
||||
TEST_COMMAND ""
|
||||
@ -872,7 +873,7 @@ if(ENABLE_FEATURE_MORSEDECODER)
|
||||
set(GGMORSE_DEPENDS ggmorse CACHE INTERNAL "")
|
||||
set_global_cache(GGMORSE_FOUND ON)
|
||||
set(GGMORSE_EXTERNAL ON CACHE INTERNAL "")
|
||||
set(GGMORSE_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/ggmorse/src" CACHE INTERNAL "")
|
||||
set(GGMORSE_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/ggmorse/src/include" CACHE INTERNAL "")
|
||||
if (WIN32)
|
||||
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/ggmorse${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
|
||||
elseif (APPLE)
|
||||
|
Loading…
Reference in New Issue
Block a user