From d4cc0d814805c562480618d26feb12c9e4660d20 Mon Sep 17 00:00:00 2001 From: B3n30 Date: Thu, 16 Nov 2017 19:28:15 +0100 Subject: [PATCH] Fix path for travis upload --- .travis/linux/upload.sh | 2 +- .travis/macos/upload.sh | 2 +- src/dedicated_room/CMakeLists.txt | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index e9150d7a0..058c41dff 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -9,7 +9,7 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" -cp build/src/citra/citra-room "$REV_NAME" +cp build/src/dedicated_room/citra-room "$REV_NAME" cp build/src/citra_qt/citra-qt "$REV_NAME" # We need icons on Linux for .desktop entries diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index fa2380fc2..1f928c03c 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -10,7 +10,7 @@ mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" cp -r build/src/citra_qt/citra-qt.app "$REV_NAME" -cp build/src/citra/citra-room "$REV_NAME" +cp build/src/dedicated_room/citra-room "$REV_NAME" # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt index 60ae42f6e..d956c20cc 100644 --- a/src/dedicated_room/CMakeLists.txt +++ b/src/dedicated_room/CMakeLists.txt @@ -1,13 +1,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) -set(SRCS - citra-room.cpp - citra-room.rc - ) +add_executable(citra-room + citra-room.cpp + citra-room.rc +) -create_directory_groups(${SRCS}) +create_target_directory_groups(citra-room) -add_executable(citra-room ${SRCS}) target_link_libraries(citra-room PRIVATE common core network) target_link_libraries(citra-room PRIVATE glad) if (MSVC)