From bf1166d0eeaec9b2ecd96d993205b35743c93345 Mon Sep 17 00:00:00 2001 From: Dragios Date: Sat, 2 May 2020 22:24:28 +0800 Subject: [PATCH 1/2] Correct output paths for executable binaries --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6180e82b5..0fcd880a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # set up output paths for executable binaries -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$) # System imported libraries From 841522f59c539ca9658822047782968e5b49fdc5 Mon Sep 17 00:00:00 2001 From: Dragios Date: Mon, 4 May 2020 22:35:20 +0800 Subject: [PATCH 2/2] Try to fix executable path generated in CI --- .travis/linux/upload.sh | 6 +++--- .travis/macos/upload.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 548ee4905..c40c0d71e 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" -cp build/bin/citra "$REV_NAME" -cp build/bin/citra-room "$REV_NAME" -cp build/bin/citra-qt "$REV_NAME" +cp build/bin/Release/citra "$REV_NAME" +cp build/bin/Release/citra-room "$REV_NAME" +cp build/bin/Release/citra-qt "$REV_NAME" # We need icons on Linux for .desktop entries mkdir "$REV_NAME/dist" diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index bdd7d7da7..05760c0b4 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" -cp build/bin/citra "$REV_NAME" -cp -r build/bin/citra-qt.app "$REV_NAME" -cp build/bin/citra-room "$REV_NAME" +cp build/bin/Release/citra "$REV_NAME" +cp -r build/bin/Release/citra-qt.app "$REV_NAME" +cp build/bin/Release/citra-room "$REV_NAME" # move libs into folder for deployment macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks"