Skip to content

Commit 69c06ab

Browse files
committed
Install and update scripts now use the real path to the framework
1 parent 59fb491 commit 69c06ab

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

UVKBuildTool

install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ function install_build_tool()
5959
cd build || die_
6060

6161
if [ "${windows}" == true ]; then
62-
cmake .. -G "Visual Studio ${VSShortVer} ${VSVer}" -DUBT_COMPILING_FOR_WEB=OFF -DCMAKE_BUILD_TYPE=RELEASE || die_
62+
cmake .. -G "Visual Studio ${VSShortVer} ${VSVer}" -DUBT_COMPILING_FOR_WEB=OFF -DCMAKE_BUILD_TYPE=RELEASE -DUBT_FRAMEWORK_DIR="$(realpath ../../)" || die_
6363
MSBuild.exe UVKBuildTool.sln -property:Configuration=Release -property:Platform=x64 -property:maxCpuCount="${cpus}" || die_
6464

6565
cp Release/UVKBuildTool.exe . &> /dev/null
6666
cp Release/*.dll . &> /dev/null
6767
else
68-
cmake .. -G "Unix Makefiles" -DUBT_COMPILING_FOR_WEB=OFF -DCMAKE_BUILD_TYPE=RELEASE || die_
68+
cmake .. -G "Unix Makefiles" -DUBT_COMPILING_FOR_WEB=OFF -DCMAKE_BUILD_TYPE=RELEASE -DUBT_FRAMEWORK_DIR="$(realpath ../../)" || die_
6969
make -j "${cpus}" || die_
7070
fi
7171

update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ git pull origin master
1010
git submodule update --remote --merge --init --recursive
1111

1212
cd build || exit
13-
cmake .. || exit
13+
cmake .. -DUBT_FRAMEWORK_DIR="$(realpath ../../)" || exit
1414
MSBuild.exe UVKBuildTool.sln -property:Configuration=Release -property:Platform=x64 -property:maxCpuCount="${cpus}" || make -j "${cpus}" || exit
1515

1616
cd ../../ || exit

0 commit comments

Comments
 (0)