From 8a440faa6901e91a0e81177bcf68431f91e03fae Mon Sep 17 00:00:00 2001 From: spycrab Date: Mon, 15 Jan 2018 10:42:40 +0100 Subject: [PATCH] CMake: Output binaries to bin/ --- .travis/linux/upload.sh | 4 ++-- .travis/macos/upload.sh | 4 ++-- CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 8a029bbe22..61842be126 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -8,7 +8,7 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" -cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" -cp build/src/yuzu/yuzu "$REV_NAME" +cp build/bin/yuzu-cmd "$REV_NAME" +cp build/bin/yuzu "$REV_NAME" . .travis/common/post-upload.sh diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index de0ba91f11..9ba95086b0 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" -cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" -cp -r build/src/yuzu/yuzu.app "$REV_NAME" +cp build/bin/yuzu-cmd "$REV_NAME" +cp -r build/bin/yuzu.app "$REV_NAME" # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" diff --git a/CMakeLists.txt b/CMakeLists.txt index 09fe9bcd31..791a3357f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,9 @@ if (NOT Boost_FOUND) find_package(Boost QUIET REQUIRED) endif() +# Output binaries to bin/ +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + # Prefer the -pthread flag on Linux. set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED)