Browse Source
Merge pull request #17 from spycrab/bindir
CMake: Output binaries to bin/
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
7 additions and
4 deletions
-
.travis/linux/upload.sh
-
.travis/macos/upload.sh
-
CMakeLists.txt
|
|
|
@ -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 |
|
|
|
@ -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" |
|
|
|
|
|
|
|
@ -166,6 +166,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) |
|
|
|
|
