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

Simulators are not found

Browse source
This commit is contained in:
Bertrand Songis 2023-09-29 14:32:32 +02:00
parent 624cf694b1
commit caaaa700f4
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
companion/src/CMakeLists.txt
View file

@ -332,7 +332,9 @@ endif()
# Generate list of simulator plugins, used by all platforms # Generate list of simulator plugins, used by all platforms
if(WIN32) if(WIN32)
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
message(STATUS ${CMAKE_BINARY_DIR})
message(STATUS ${simulator_plugins})
else() else()
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif() endif()
@ -405,18 +407,18 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(OperatingSystem "Linux") set(OperatingSystem "Linux")
elseif(WIN32) elseif(WIN32)
set(INSTALL_DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
if(NOT WIN_DO_FULL_INSTALL) if(NOT WIN_DO_FULL_INSTALL)
# Just copy supporting DLLs to build folder # Just copy supporting DLLs to build folder
set(INSTALL_DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
message(STATUS "Partial install to " ${INSTALL_DESTINATION}) message(STATUS "Partial install to " ${INSTALL_DESTINATION})
else() else()
# Full Windows installation with all supporting files # Full Windows installation with all supporting files
set(INSTALL_DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
message(STATUS "Full install to " ${INSTALL_DESTINATION}) message(STATUS "Full install to " ${INSTALL_DESTINATION})
# companion & simulator binaries # companion & simulator binaries
install(TARGETS ${COMPANION_NAME} DESTINATION ${INSTALL_DESTINATION}) install(TARGETS ${COMPANION_NAME} DESTINATION ${INSTALL_DESTINATION})
install(TARGETS ${SIMULATOR_NAME} DESTINATION ${INSTALL_DESTINATION}) install(TARGETS ${SIMULATOR_NAME} DESTINATION ${INSTALL_DESTINATION})
install(FILES ${simulator_plugins} DESTINATION "${INSTALL_DESTINATION}") # simulator dlls
install(FILES ${simulator_plugins} DESTINATION ${INSTALL_DESTINATION})
# supporting utilities # supporting utilities
set(INSTALL_TEMP_FILES dfu-util.exe libusb0.dll libusb-1.0.dll license.txt) set(INSTALL_TEMP_FILES dfu-util.exe libusb0.dll libusb-1.0.dll license.txt)
foreach(tmpfile ${INSTALL_TEMP_FILES}) foreach(tmpfile ${INSTALL_TEMP_FILES})