Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-22 15:55:17 +03:00
Code Activity

Debian package generation fixes for simulators (lib files were in the wrong directory, bunch of empty directories were included in package)

Browse source
This commit is contained in:
Damjan Adamic 2016-08-21 20:47:05 +02:00
parent 9b7d97b441
commit 7dc75cf73f
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/src/CMakeLists.txt
View file

@ -267,7 +267,13 @@ message(STATUS ${CMAKE_BINARY_DIR} ${CMAKE_INSTALL_PREFIX}/bin)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(DIRECTORY ${CMAKE_BINARY_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*.so" PATTERN REGEX "_CPack_Packages" EXCLUDE) install(DIRECTORY ${CMAKE_BINARY_DIR}/ DESTINATION ${SIMULATOR_LIB_PATH} USE_SOURCE_PERMISSIONS
FILES_MATCHING PATTERN "libopentx-*.so"
PATTERN "CMakeFiles" EXCLUDE
PATTERN "_CPack_Packages" EXCLUDE
PATTERN "companion" EXCLUDE
PATTERN "radio" EXCLUDE
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
if(${CMAKE_INSTALL_PREFIX} MATCHES "/usr/local") if(${CMAKE_INSTALL_PREFIX} MATCHES "/usr/local")

6
companion/src/simulation/simulatorinterface.cpp
View file

@ -56,9 +56,9 @@ void registerSimulators()
#elif (!defined __GNUC__) #elif (!defined __GNUC__)
char name[MAX_PATH]; char name[MAX_PATH];
GetModuleFileName(NULL, name, MAX_PATH); GetModuleFileName(NULL, name, MAX_PATH);
QString path(name); QString path(name);
path.truncate(path.lastIndexOf('\\')); path.truncate(path.lastIndexOf('\\'));
dir.setPath(path); dir.setPath(path);
#else #else
dir = SIMULATOR_LIB_SEARCH_PATH; dir = SIMULATOR_LIB_SEARCH_PATH;
#endif #endif