all repos — mgba @ d3a0ce00db07af2f1322c4014b79b221ff1b98c9

mGBA Game Boy Advance Emulator

Qt: Fix .deb dependencies
Jeffrey Pfau jeffrey@endrift.com
Sat, 04 Apr 2015 21:12:07 -0700
commit

d3a0ce00db07af2f1322c4014b79b221ff1b98c9

parent

9df80a437af7d4d6187cc1915a88e63d2e993002

2 files changed, 4 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -3,6 +3,7 @@ Bugfixes:

- GBA: Fix timers not updating timing when writing to only the reload register - All: Fix sanitize-deb script not cleaning up after itself - Qt: Fix Display object leak when closing a window + - Qt: Fix .deb dependencies 0.2.0: (2015-04-03) Features:
M src/platform/qt/CMakeLists.txtsrc/platform/qt/CMakeLists.txt

@@ -79,7 +79,7 @@ ShortcutView.ui

VideoView.ui) set(QT_LIBRARIES) -set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libqt5widgets5,libqt5opengl5" PARENT_SCOPE) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libqt5widgets5,libqt5opengl5") set(AUDIO_SRC) if(BUILD_SDL)

@@ -92,7 +92,7 @@ AudioProcessorQt.cpp

AudioDevice.cpp) list(APPEND QT_LIBRARIES Qt5::Multimedia) add_definitions(-DBUILD_QT_MULTIMEDIA) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libqt5multimedia5" PARENT_SCOPE) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libqt5multimedia5") endif() if(NOT AUDIO_SRC)

@@ -120,6 +120,7 @@ set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES}")

list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::OpenGL) target_link_libraries(${BINARY_NAME}-qt ${PLATFORM_LIBRARY} ${OPENGL_LIBRARY} ${BINARY_NAME} ${QT_LIBRARIES}) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}" PARENT_SCOPE) install(TARGETS ${BINARY_NAME}-qt RUNTIME DESTINATION bin COMPONENT ${BINARY_NAME}-qt