Skip to content

Commit 933a2aa

Browse files
committed
Disambiguate the provided to cmake path to be a src dir
cmake treats the provided path differently depending on whether it contains a CMakeCache.txt or not. If it doesn't contain it -- it's treated as a path to the source tree, if it does -- as a path to the build tree. We want it to be treated as a source tree path, but if a user has CMakeCache.txt in that directory, e.g. from a previous in-tree build the user has done, cmake will treat it as a build tree instead, which might lead to unexpected results (improperly configured build) or an error, with the latter being more likely considering we are building inside a container and the host paths specified in the user-generated CMakeCache.txt likely don't exist in there.
1 parent 7dfa935 commit 933a2aa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

other/docker/windows/build_toxcore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ build() {
7070
-DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS -fstack-protector" \
7171
-DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS" \
7272
$EXTRA_CMAKE_FLAGS \
73-
..
73+
-S ..
7474
cmake --build . --target install -- -j"$(nproc)"
7575

7676
if [ "$ENABLE_TEST" = "true" ]; then

0 commit comments

Comments
 (0)