Skip to content
Snippets Groups Projects
Unverified Commit 67c8b671 authored by bunnei's avatar bunnei Committed by GitHub
Browse files

Merge pull request #17 from spycrab/bindir

CMake: Output binaries to bin/
parents 054d3e5f 8a440faa
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ COMPRESSION_FLAGS="-cJvf" ...@@ -8,7 +8,7 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" cp build/bin/yuzu-cmd "$REV_NAME"
cp build/src/yuzu/yuzu "$REV_NAME" cp build/bin/yuzu "$REV_NAME"
. .travis/common/post-upload.sh . .travis/common/post-upload.sh
...@@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf" ...@@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" cp build/bin/yuzu-cmd "$REV_NAME"
cp -r build/src/yuzu/yuzu.app "$REV_NAME" cp -r build/bin/yuzu.app "$REV_NAME"
# move qt libs into app bundle for deployment # move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app"
......
...@@ -166,6 +166,9 @@ if (NOT Boost_FOUND) ...@@ -166,6 +166,9 @@ if (NOT Boost_FOUND)
find_package(Boost QUIET REQUIRED) find_package(Boost QUIET REQUIRED)
endif() endif()
# Output binaries to bin/
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# Prefer the -pthread flag on Linux. # Prefer the -pthread flag on Linux.
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment