CMake: Packaging fixes
Vicki Pfau vi@endrift.com
Mon, 03 Sep 2018 23:46:47 -0700
2 files changed,
8 insertions(+),
7 deletions(-)
M
CMakeLists.txt
→
CMakeLists.txt
@@ -1006,18 +1006,19 @@ endif()
if(BUILD_QT) cpack_add_component_group(qt PARENT_GROUP base) - cpack_add_component(${BINARY_NAME}-qt GROUP qt DEPENDS base) + cpack_add_component(${BINARY_NAME}-qt GROUP qt) endif() -if(FOUND_SDL) +if(SDL_VERSION) + message(STATUS Hi) cpack_add_component_group(sdl PARENT_GROUP base) - cpack_add_component(${BINARY_NAME}-sdl GROUP sdl DEPENDS base) + cpack_add_component(${BINARY_NAME}-sdl GROUP sdl) endif() cpack_add_component_group(test PARENT_GROUP dev) -cpack_add_component(${BINARY_NAME}-perf GROUP test DEPENDS dev) -cpack_add_component(${BINARY_NAME}-fuzz GROUP test DEPENDS dev) -cpack_add_component(tbl-fuzz GROUP test DEPENDS dev) +cpack_add_component(${BINARY_NAME}-perf GROUP test) +cpack_add_component(${BINARY_NAME}-fuzz GROUP test) +cpack_add_component(tbl-fuzz GROUP test) # Summaries set(SUMMARY_GL_LIST)
M
src/platform/qt/CMakeLists.txt
→
src/platform/qt/CMakeLists.txt
@@ -288,7 +288,7 @@ BUNDLE DESTINATION Applications COMPONENT ${BINARY_NAME}-qt)
if(UNIX AND NOT APPLE) find_program(DESKTOP_FILE_INSTALL desktop-file-install) if(DESKTOP_FILE_INSTALL) - install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")") + install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")" COMPONENT ${BINARY_NAME}-qt) endif() endif() if(UNIX)