N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5332 from Dragios/fix-exe-path

Browse source 
Correct output paths for executable binaries in CMakeLists.txt
This commit is contained in:
Marshall Mohror 2020-07-14 09:10:11 -05:00 committed by GitHub
commit 897e473da4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis/linux/upload.sh
View file

@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/bin/citra "$REV_NAME" cp build/bin/Release/citra "$REV_NAME"
cp build/bin/citra-room "$REV_NAME" cp build/bin/Release/citra-room "$REV_NAME"
cp build/bin/citra-qt "$REV_NAME" cp build/bin/Release/citra-qt "$REV_NAME"
# We need icons on Linux for .desktop entries # We need icons on Linux for .desktop entries
mkdir "$REV_NAME/dist" mkdir "$REV_NAME/dist"

6
.travis/macos/upload.sh
View file

@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/bin/citra "$REV_NAME" cp build/bin/Release/citra "$REV_NAME"
cp -r build/bin/citra-qt.app "$REV_NAME" cp -r build/bin/Release/citra-qt.app "$REV_NAME"
cp build/bin/citra-room "$REV_NAME" cp build/bin/Release/citra-room "$REV_NAME"
# move libs into folder for deployment # move libs into folder for deployment
macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks" macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks"

2
CMakeLists.txt
View file

@ -126,7 +126,7 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# set up output paths for executable binaries # 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/$<CONFIG>)
# System imported libraries # System imported libraries