diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 9c98e519d..7f6ef9263 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -313,7 +313,7 @@ add_subdirectory(tests) ############# Install #################### # Generate list of simulator plugins, used by all platforms -file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") +file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*edgetx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") # the current flavour is not automatically added if build in the current cmake iteration, so always # add its library name to be sure @@ -349,7 +349,7 @@ if(POLICY CMP0026) endif() if(SIMU_TARGET) - get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION) + get_property(current_plugin TARGET edgetx-${FLAVOUR}-simulator PROPERTY LOCATION) list(APPEND simulator_plugins "${current_plugin}") endif() @@ -545,7 +545,7 @@ if(APPLE) set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/companion/targets/mac/DS_Store) set(CPACK_PACKAGE_FILE_NAME "opentx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}") endif(APPLE) - + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") get_filename_component(_qt_bin_dir "${QT_QMAKE_EXECUTABLE}" DIRECTORY) find_program(LINUXDEPLOY_EXECUTABLE linuxdeployqt HINTS "${_qt_bin_dir}") diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt index 60f9a69b2..8f45df562 100644 --- a/radio/src/targets/simu/CMakeLists.txt +++ b/radio/src/targets/simu/CMakeLists.txt @@ -34,7 +34,7 @@ if(SIMU_LUA_COMPILER) endif() if(Qt5Widgets_FOUND) - set(SIMULATOR_FLAVOUR opentx-${FLAVOUR}) + set(SIMULATOR_FLAVOUR edgetx-${FLAVOUR}) set(SIMULATOR_TARGET ${SIMULATOR_FLAVOUR}-simulator) add_definitions(-DSIMULATOR_FLAVOUR="${SIMULATOR_FLAVOUR}") include_directories(${COMPANION_SRC_DIRECTORY} ${COMPANION_SRC_DIRECTORY}/simulation) @@ -52,7 +52,7 @@ if(Qt5Widgets_FOUND) COMMAND ${CMAKE_STRIP} $) endif() endif() - + # Introduced at 2.5 - TODO replace with a code change # When compiled shared simulators using libopenui and Companion have classes named MainWindow