drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia] Fix setup-build cmake invokation

Browse Source
This commit is contained in:
Gary Talent 2020-01-12 21:53:57 -06:00
parent f59ad72ca2
commit 441edf0d37
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/setup-build
View File

@ -33,8 +33,8 @@ buildDir="${project}/build/${TARGET}-${BUILD_TYPE}"
distDir="${project}/dist/${TARGET}-${BUILD_TYPE}" distDir="${project}/dist/${TARGET}-${BUILD_TYPE}"
mkdir -p $buildDir mkdir -p $buildDir
pushd $buildDir cmake -S $project -B $buildDir \
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_PREFIX="$distDir" \ -DCMAKE_INSTALL_PREFIX="$distDir" \
-DCMAKE_INSTALL_RPATH="$project/dist/${TARGET}-${BUILD_TYPE}/lib/nostalgia" \ -DCMAKE_INSTALL_RPATH="$project/dist/${TARGET}-${BUILD_TYPE}/lib/nostalgia" \
-DNOSTALGIA_IDE_BUILD=OFF \ -DNOSTALGIA_IDE_BUILD=OFF \
@ -44,9 +44,7 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
$BUILD_TYPEArgs \ $BUILD_TYPEArgs \
$sanitizerArgs \ $sanitizerArgs \
$qtPath \ $qtPath \
$toolchain \ $toolchain
$project
popd
rm -f build/current dist/current rm -f build/current dist/current
mkdir -p dist mkdir -p dist