Skip to content
This repository was archived by the owner on Apr 28, 2023. It is now read-only.

Commit 86c571e

Browse files
author
Sven Verdoolaege
committed
build.sh: let caller override CMAKE_PREFIX_PATH
It is not clear exactly what CMAKE_PREFIX_PATH is used for. In prehistory, it used to point to third-party-install/ and then was changed to third-party-install/lib/cmake in some conda related commit. Stick to its current value, but allow the caller to override it if needed. Use CONDA_PREFIX directly, since THIRD_PARTY_INSTALL_PREFIX will be changed in an upcoming commit.
1 parent 639ee29 commit 86c571e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ WITH_CAFFE2=${WITH_CAFFE2:=OFF}
2222
WITH_TAPIR=${WITH_TAPIR:=ON}
2323

2424
CUDNN_ROOT_DIR=${CUDNN_ROOT_DIR:=${CONDA_PREFIX}}
25+
CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=${CONDA_PREFIX}/lib/cmake}
2526

2627
THIRD_PARTY_INSTALL_PREFIX=${CONDA_PREFIX}
2728

@@ -45,7 +46,7 @@ cmake -DWITH_CAFFE2=${WITH_CAFFE2} \
4546
-DWITH_TAPIR=${WITH_TAPIR} \
4647
-DPYTHON_EXECUTABLE=${PYTHON} \
4748
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
48-
-DCMAKE_PREFIX_PATH=${THIRD_PARTY_INSTALL_PREFIX}/lib/cmake \
49+
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} \
4950
-DTHIRD_PARTY_INSTALL_PREFIX=${THIRD_PARTY_INSTALL_PREFIX} \
5051
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
5152
-DCLANG_PREFIX=${CLANG_PREFIX} \

0 commit comments

Comments
 (0)