Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 03:19:53 +03:00
Code Issues Wiki Activity

Needed?

Browse source
This commit is contained in:
Bertrand Songis 2023-09-29 15:17:22 +02:00
parent caaaa700f4
commit d07b6419b4
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
3 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
companion/src/CMakeLists.txt
View file

@ -372,14 +372,6 @@ elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T18)
else() else()
string(TOLOWER ${PCB} FLAVOUR) string(TOLOWER ${PCB} FLAVOUR)
endif() endif()
if(POLICY CMP0026)
cmake_policy(SET CMP0026 OLD) # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
endif()
if(SIMU_TARGET)
get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
list(APPEND simulator_plugins "${current_plugin}")
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin) message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
@ -440,8 +432,6 @@ elseif(WIN32)
# Add installer command to execute windeployqt # Add installer command to execute windeployqt
message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}") message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}")
install(CODE "execute_process(COMMAND pwd)")
install(CODE "execute_process(COMMAND ls *)")
install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})") install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
# SDL dll # SDL dll

7
radio/src/targets/simu/CMakeLists.txt
View file

@ -1,10 +1,3 @@
option(SIMU_TARGET "Configure libsimulator/simu targets (can be turned off for compiling Companion only)" ON)
if(NOT SIMU_TARGET)
message(STATUS "libsimulator/simu targets disabled")
return()
endif()
foreach(FILE ${SRC}) foreach(FILE ${SRC})
set(SIMU_SRC ${SIMU_SRC} ../../${FILE}) set(SIMU_SRC ${SIMU_SRC} ../../${FILE})
endforeach() endforeach()

2
tools/build-companion-nightly.sh
View file

@ -156,7 +156,7 @@ elif [ "$(uname)" = "Linux" ]; then
make -j${JOBS} package make -j${JOBS} package
cp *.deb "${OUTDIR}" cp *.deb "${OUTDIR}"
else else
cmake ${COMMON_OPTIONS} -DWIN_DO_FULL_INSTALL=YES -DSIMU_TARGET=NO ${SRCDIR} cmake ${COMMON_OPTIONS} -DWIN_DO_FULL_INSTALL=YES ${SRCDIR}
make -j${JOBS} installer make -j${JOBS} installer
cp companion/*.exe "${OUTDIR}" cp companion/*.exe "${OUTDIR}"
fi fi