diff options
author | Yangqing Jia <jiayq84@gmail.com> | 2018-02-24 00:02:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-24 00:02:18 -0800 |
commit | ff189b9023b05d40740cbaa4f897cb1e3a934e37 (patch) | |
tree | eda8cc0bd4f21364ea5157aa98830a72ed4cc5b3 /.jenkins | |
parent | 07414d94d7e86d881a045717c0311bd41bd5ec3b (diff) | |
download | pytorch-ff189b9023b05d40740cbaa4f897cb1e3a934e37.tar.gz pytorch-ff189b9023b05d40740cbaa4f897cb1e3a934e37.tar.bz2 pytorch-ff189b9023b05d40740cbaa4f897cb1e3a934e37.zip |
Update CMake min requirement to 3, and use interface library for cuda libs. (#2021)
* Try use CMake interface library to simplify some of the cuda libs.
* Bump to cmake 3
Diffstat (limited to '.jenkins')
-rwxr-xr-x | .jenkins/build.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.jenkins/build.sh b/.jenkins/build.sh index 5d27d2d888..a77631e11c 100755 --- a/.jenkins/build.sh +++ b/.jenkins/build.sh @@ -105,8 +105,16 @@ if [ "$(uname)" == "Darwin" ]; then CMAKE_ARGS+=("-DBUILD_CUSTOM_PROTOBUF=ON") fi +# We test the presence of cmake3 (for platforms like Centos and Ubuntu 14.04) +# and use that if so. +if [[ -x "$(command -v cmake3)" ]]; then + CMAKE_BINARY=cmake3 +else + CMAKE_BINARY=cmake +fi + # Configure -cmake "${ROOT_DIR}" ${CMAKE_ARGS[*]} "$@" +${CMAKE_BINARY} "${ROOT_DIR}" ${CMAKE_ARGS[*]} "$@" # Build if [ "$(uname)" == "Linux" ]; then |