mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
Merge pull request #5332 from Dragios/fix-exe-path
Correct output paths for executable binaries in CMakeLists.txt
This commit is contained in:
commit
897e473da4
@ -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"
|
||||||
|
@ -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"
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user