From 824453b133f1873a1113c2c6f7fdc901116ebbad Mon Sep 17 00:00:00 2001 From: Hamish Milne Date: Thu, 16 Apr 2020 19:04:04 +0100 Subject: [PATCH] Remove the build type from the bin path --- .travis/linux/upload.sh | 6 +++--- .travis/macos/upload.sh | 6 +++--- CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index c40c0d71e..548ee4905 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$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" +cp build/bin/citra "$REV_NAME" +cp build/bin/citra-room "$REV_NAME" +cp build/bin/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 05760c0b4..bdd7d7da7 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf" mkdir "$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" +cp build/bin/citra "$REV_NAME" +cp -r build/bin/citra-qt.app "$REV_NAME" +cp build/bin/citra-room "$REV_NAME" # move libs into folder for deployment macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks" diff --git a/CMakeLists.txt b/CMakeLists.txt index 50153c808..e85534e8f 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/${CMAKE_BUILD_TYPE}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # System imported libraries