[Companion] Cosmetics
This commit is contained in:
@@ -358,28 +358,26 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
|
set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTX open source firmware")
|
||||||
string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
|
string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
|
||||||
|
|
||||||
# The file stripping is deliberately disabled, with the stripped file we get
|
# The file stripping is deliberately disabled, with the stripped file we get
|
||||||
# very poor trace-backs from the users when they report Companion crash
|
# very poor trace-backs from the users when they report Companion crash
|
||||||
set(CPACK_STRIP_FILES FALSE)
|
set(CPACK_STRIP_FILES FALSE)
|
||||||
|
|
||||||
|
set(plugin_dest_dir bin)
|
||||||
SET(plugin_dest_dir bin)
|
set(qtconf_dest_dir bin)
|
||||||
SET(qtconf_dest_dir bin)
|
set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${COMPANION_NAME}")
|
||||||
SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${COMPANION_NAME}")
|
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
SET(plugin_dest_dir ${COMPANION_NAME}.app/Contents/Plugins)
|
set(plugin_dest_dir ${COMPANION_NAME}.app/Contents/Plugins)
|
||||||
SET(qtconf_dest_dir ${COMPANION_NAME}.app/Contents/Resources)
|
set(qtconf_dest_dir ${COMPANION_NAME}.app/Contents/Resources)
|
||||||
SET(translations_dest_dir ${COMPANION_NAME}.app/Contents/translations)
|
set(translations_dest_dir ${COMPANION_NAME}.app/Contents/translations)
|
||||||
SET(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
|
set(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
|
||||||
set_target_properties(${COMPANION_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenTX Companion ${VERSION_MAJOR}.${VERSION_MINOR}")
|
set_target_properties(${COMPANION_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenTX Companion ${VERSION_MAJOR}.${VERSION_MINOR}")
|
||||||
set_target_properties(${SIMULATOR_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenTX Simulator ${VERSION_MAJOR}.${VERSION_MINOR}")
|
set_target_properties(${SIMULATOR_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "OpenTX Simulator ${VERSION_MAJOR}.${VERSION_MINOR}")
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/QtTest.exe")
|
set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/QtTest.exe")
|
||||||
|
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
|
||||||
@@ -389,12 +387,12 @@ INSTALL(TARGETS ${COMPANION_NAME}
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Qt5 + Cmake + Mac is poorly documented. A lot of this is guesswork
|
# Qt5 + Cmake + Mac is poorly documented. A lot of this is guesswork
|
||||||
# and trial and error. Do not hestinate to fix it for the better
|
# and trial and error. Do not hesitate to fix it for the better
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
|
set(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
|
||||||
|
|
||||||
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||||
SET(companion_res_dir ${COMPANION_NAME}.app/Contents/Resources)
|
set(companion_res_dir ${COMPANION_NAME}.app/Contents/Resources)
|
||||||
install(FILES ${simulator_plugins} DESTINATION "${companion_res_dir}" COMPONENT Runtime)
|
install(FILES ${simulator_plugins} DESTINATION "${companion_res_dir}" COMPONENT Runtime)
|
||||||
|
|
||||||
# Write qt.conf to tell qt where to find it plugins
|
# Write qt.conf to tell qt where to find it plugins
|
||||||
@@ -405,14 +403,14 @@ if(APPLE)
|
|||||||
COMPONENT Runtime)
|
COMPONENT Runtime)
|
||||||
|
|
||||||
# menu file
|
# menu file
|
||||||
INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/companion/targets/mac/qt_menu.nib DESTINATION "${companion_res_dir}" COMPONENT Runtime)
|
install(DIRECTORY ${PROJECT_SOURCE_DIR}/companion/targets/mac/qt_menu.nib DESTINATION "${companion_res_dir}" COMPONENT Runtime)
|
||||||
|
|
||||||
# translations file
|
# translations file
|
||||||
INSTALL(FILES ${companion_QM} DESTINATION "${translations_dest_dir}" COMPONENT Runtime)
|
install(FILES ${companion_QM} DESTINATION "${translations_dest_dir}" COMPONENT Runtime)
|
||||||
|
|
||||||
# manually add the cocoa plugin
|
# manually add the cocoa plugin
|
||||||
get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
|
get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
|
||||||
INSTALL(FILES ${QPA_PLUGIN} DESTINATION "${plugin_dest_dir}/platforms/" COMPONENT Runtime)
|
install(FILES ${QPA_PLUGIN} DESTINATION "${plugin_dest_dir}/platforms/" COMPONENT Runtime)
|
||||||
set(bundle_qt_libs "\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/platforms/libqcocoa.dylib")
|
set(bundle_qt_libs "\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/platforms/libqcocoa.dylib")
|
||||||
|
|
||||||
# Add icon
|
# Add icon
|
||||||
@@ -420,24 +418,22 @@ if(APPLE)
|
|||||||
set(MAC_ICON_FILE ${COMPANION_SRC_DIRECTORY}/images/${MACOSX_BUNDLE_ICON_FILE})
|
set(MAC_ICON_FILE ${COMPANION_SRC_DIRECTORY}/images/${MACOSX_BUNDLE_ICON_FILE})
|
||||||
SET_SOURCE_FILES_PROPERTIES(${MAC_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
|
SET_SOURCE_FILES_PROPERTIES(${MAC_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
|
||||||
set(${COMPANION_SOURCES} ${COMPANION_SOURCES} ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE})
|
set(${COMPANION_SOURCES} ${COMPANION_SOURCES} ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE})
|
||||||
INSTALL(FILES ${MAC_ICON_FILE} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
install(FILES ${MAC_ICON_FILE} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
||||||
|
|
||||||
# Copy dfu-util, resolve symlink first
|
# Copy dfu-util, resolve symlink first
|
||||||
get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
|
get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
|
||||||
INSTALL(FILES ${DFU_UTIL_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
install(FILES ${DFU_UTIL_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
||||||
set(bundle_dfu_util_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util")
|
set(bundle_dfu_util_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util")
|
||||||
|
|
||||||
|
# These needs to be relative to CMAKE_INSTALL_PREFIX
|
||||||
# these needs to be relative to CMAKE_INSTALL_PREFIX
|
|
||||||
get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
|
get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
|
||||||
get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
|
get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
|
||||||
get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
|
get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
|
||||||
|
|
||||||
|
|
||||||
# Include depencies (adding frameworks, fixing the embbeded libraries)
|
# Include depencies (adding frameworks, fixing the embbeded libraries)
|
||||||
# I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
|
# I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
|
||||||
# technically a hack (that is already is in the Bundle library ....)
|
# technically a hack (that is already is in the Bundle library ....)
|
||||||
INSTALL(CODE "
|
install(CODE "
|
||||||
include(BundleUtilities)
|
include(BundleUtilities)
|
||||||
file(GLOB bundle_simulator_libs \"\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
|
file(GLOB bundle_simulator_libs \"\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
|
||||||
set(BU_CHMOD_BUNDLE_ITEMS on)
|
set(BU_CHMOD_BUNDLE_ITEMS on)
|
||||||
@@ -475,7 +471,7 @@ else(DPKG_PROGRAM)
|
|||||||
set(CPACK_RPM_PACKAGE_VERSION ${VERSION})
|
set(CPACK_RPM_PACKAGE_VERSION ${VERSION})
|
||||||
set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
|
set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
|
||||||
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
|
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
|
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
|
||||||
endif(DPKG_PROGRAM)
|
endif(DPKG_PROGRAM)
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|||||||
@@ -346,8 +346,8 @@ set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAG
|
|||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
if(ARCH STREQUAL ARM)
|
if(ARCH STREQUAL ARM)
|
||||||
cmake_force_c_compiler(arm-none-eabi-gcc GNU)
|
set(CMAKE_C_COMPILER arm-none-eabi-gcc)
|
||||||
cmake_force_cxx_compiler(arm-none-eabi-g++ GNU)
|
set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
|
||||||
set(CMAKE_ASM_COMPILER arm-none-eabi-as)
|
set(CMAKE_ASM_COMPILER arm-none-eabi-as)
|
||||||
|
|
||||||
set(CMAKE_SYSTEM_NAME Generic)
|
set(CMAKE_SYSTEM_NAME Generic)
|
||||||
@@ -390,10 +390,10 @@ if(NOT MSVC)
|
|||||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
cmake_force_c_compiler(avr-gcc GNU)
|
set(CMAKE_C_COMPILER avr-gcc)
|
||||||
cmake_force_cxx_compiler(avr-gcc GNU)
|
set(CMAKE_CXX_COMPILER avr-gcc)
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "-mmcu=${MCU} -DF_CPU=16000000UL -O${OPT} -gdwarf-2 -fno-exceptions -flto -fwhole-program -fno-inline-small-functions -mstrict-X ${WARNING_FLAGS}")
|
set(CMAKE_CXX_FLAGS "-mmcu=${MCU} -DF_CPU=16000000UL -O${OPT} -gdwarf-2 -fno-exceptions -flto -fwhole-program -fno-inline-small-functions -mstrict-X ${WARNING_FLAGS}")
|
||||||
|
|
||||||
# Remove once the minimum cmake version is set to 3.1 in the main CmakeLists.tx
|
# Remove once the minimum cmake version is set to 3.1 in the main CmakeLists.tx
|
||||||
if (${CMAKE_VERSION} VERSION_LESS 3.1.0})
|
if (${CMAKE_VERSION} VERSION_LESS 3.1.0})
|
||||||
set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
|
||||||
|
|||||||
Reference in New Issue
Block a user