VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-25 09:33:18 -05:00
Code Issues Projects Releases Wiki Activity

Remove debug and files that shouldn't have been comitted.

Browse Source
This commit is contained in:
Jon Beniston 2025-10-31 15:37:02 +00:00
parent 11074ac875
commit 28da198f5b
3 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakePresets.json
View File

@ -44,11 +44,8 @@
"name": "default-windows", "name": "default-windows",
"binaryDir": "${sourceDir}/build", "binaryDir": "${sourceDir}/build",
"cacheVariables": { "cacheVariables": {
//"CMAKE_BUILD_TYPE": "Release",
"CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_BUILD_TYPE": "RelWithDebInfo",
//"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_OUTPUT": "ON", "DEBUG_OUTPUT": "ON",
"SANITIZE_ADDRESS": "OFF",
"RX_SAMPLE_24BIT": "ON", "RX_SAMPLE_24BIT": "ON",
"ARCH_OPT": "SSE4_2", "ARCH_OPT": "SSE4_2",
"HIDE_CONSOLE": "OFF", "HIDE_CONSOLE": "OFF",
@ -58,11 +55,11 @@
"ENABLE_HACKRF": "ON", "ENABLE_HACKRF": "ON",
"ENABLE_IIO": "ON", "ENABLE_IIO": "ON",
"ENABLE_MIRISDR": "OFF", "ENABLE_MIRISDR": "OFF",
"ENABLE_PERSEUS": "OFF", "ENABLE_PERSEUS": "ON",
"ENABLE_RTLSDR": "ON", "ENABLE_RTLSDR": "ON",
"ENABLE_SDRPLAY": "ON", "ENABLE_SDRPLAY": "ON",
"ENABLE_SOAPYSDR": "ON", "ENABLE_SOAPYSDR": "ON",
"ENABLE_XTRX": "OFF", "ENABLE_XTRX": "ON",
"ENABLE_USRP": "ON", "ENABLE_USRP": "ON",
"BUILD_SERVER": "OFF", "BUILD_SERVER": "OFF",
"CMAKE_PREFIX_PATH": "C:/Qt/5.15.2/msvc2019_64;C:/Applications/boost_1_81_0" "CMAKE_PREFIX_PATH": "C:/Qt/5.15.2/msvc2019_64;C:/Applications/boost_1_81_0"
@ -90,14 +87,7 @@
"binaryDir": "${sourceDir}/build-qt6", "binaryDir": "${sourceDir}/build-qt6",
"cacheVariables": { "cacheVariables": {
"ENABLE_QT6": "ON", "ENABLE_QT6": "ON",
"CMAKE_PREFIX_PATH": "C:/Qt/6.7.3/msvc2022_64;C:/Applications/boost_1_81_0", "CMAKE_PREFIX_PATH": "C:/Qt/6.7.3/msvc2022_64;C:/Applications/boost_1_81_0"
"CMAKE_BUILD_TYPE": "Release"
//"CMAKE_BUILD_TYPE": "RelWithDebInfo",
//"CMAKE_BUILD_TYPE": "Debug"
//"BUILD_SERVER": "ON",
//"RX_SAMPLE_24BIT": "OFF",
//"ENABLE_CHANNELMIMO_DOA2": "OFF",
//"ENABLE_CHANNELMIMO_INTERFEROMETER": "OFF"
} }
} }
], ],

22
cmake/cpack/deploy_mac.cmake.in
View File

@ -25,13 +25,6 @@ foreach(RPATH_DIR ${EXTERNAL_LIB_DIRS})
execute_process(COMMAND /usr/bin/install_name_tool -add_rpath ${RPATH_DIR} ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/MacOS/SDRangel) execute_process(COMMAND /usr/bin/install_name_tool -add_rpath ${RPATH_DIR} ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/MacOS/SDRangel)
endforeach() endforeach()
execute_process ( COMMAND echo "EXTERNAL_LIB_DIRS ${EXTERNAL_LIB_DIRS}" )
execute_process ( COMMAND echo "checking signature pre rpath" )
execute_process ( COMMAND codesign -vv /Users/runner/work/sdrangel/sdrangel/build/external/libusb/lib/libusb-1.0.dylib )
execute_process ( COMMAND md5sum /Users/runner/work/sdrangel/sdrangel/build/external/libusb/lib/libusb-1.0.dylib )
execute_process ( COMMAND echo "signature checked" )
# Add RPATH to libraries in build directory # Add RPATH to libraries in build directory
foreach(RPATH_DIR_1 ${EXTERNAL_LIB_DIRS}) foreach(RPATH_DIR_1 ${EXTERNAL_LIB_DIRS})
file(GLOB LIBS_TO_FIX ${RPATH_DIR_1}/*.dylib) file(GLOB LIBS_TO_FIX ${RPATH_DIR_1}/*.dylib)
@ -44,23 +37,10 @@ foreach(RPATH_DIR_1 ${EXTERNAL_LIB_DIRS})
endforeach() endforeach()
endforeach() endforeach()
execute_process ( COMMAND echo "checking signature pre deploy" )
execute_process ( COMMAND codesign -vv /Users/runner/work/sdrangel/sdrangel/build/external/libusb/lib/libusb-1.0.dylib )
execute_process ( COMMAND md5sum /Users/runner/work/sdrangel/sdrangel/build/external/libusb/lib/libusb-1.0.dylib )
execute_process ( COMMAND echo "signature checked" )
# Run macdeployqt which should copy all libraries and frameworks and Qt plugins and qml # Run macdeployqt which should copy all libraries and frameworks and Qt plugins and qml
message ("Running macdeployqt in ${CPACK_TEMPORARY_INSTALL_DIRECTORY}") message ("Running macdeployqt in ${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ ) execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ )
execute_process ( COMMAND echo "checking signature post" ) # macdeployqt corrupts libusb signature, so resign it. See: https://github.com/f4exb/sdrangel/issues/2524
execute_process ( COMMAND codesign -vv ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
execute_process ( COMMAND md5sum ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
execute_process ( COMMAND echo "signature checked" )
execute_process ( COMMAND echo "resigning" ) execute_process ( COMMAND echo "resigning" )
execute_process ( COMMAND codesign --force --sign - ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib ) execute_process ( COMMAND codesign --force --sign - ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
execute_process ( COMMAND codesign -vv ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
execute_process ( COMMAND md5sum ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
execute_process ( COMMAND echo "resigned" )

20
launch.vs.json
View File

@ -1,20 +0,0 @@
{
"version": "0.2.1",
"defaults": {},
"configurations": [
{
"type": "default",
"project": "CMakeLists.txt",
"projectTarget": "sdrangel.exe (bin\\sdrangel.exe)",
"name": "sdrangel.exe (bin\\sdrangel.exe)",
//"args": [ "--remote-tcp", "--remote-tcp-hwtype", "RTLSDR", "--remote-tcp-port", "4321", "--remote-tcp-address", "127.0.0.1" ]
},
{
"type": "default",
"project": "CMakeLists.txt",
"projectTarget": "sdrangelsrv.exe (bin\\sdrangelsrv.exe)",
"name": "sdrangelsrv.exe (bin\\sdrangelsrv.exe)",
"args": [ "--remote-tcp", "--remote-tcp-hwtype", "RTLSDR" ]
}
]
}