File tree 2 files changed +3
-3
lines changed 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -148,7 +148,7 @@ option(BUILD_BINARY "Build C++ binaries" OFF)
148
148
option (BUILD_DOCS "Build Caffe2 documentation" OFF )
149
149
option (BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" ON )
150
150
option (BUILD_PYTHON "Build Python binaries" ON )
151
- option (BUILD_CAFFE2 "Master flag to build Caffe2" ON )
151
+ option (BUILD_CAFFE2 "Master flag to build Caffe2" OFF )
152
152
option (BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF )
153
153
cmake_dependent_option(
154
154
BUILD_CAFFE2_OPS "Build Caffe2 operators" ON
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ if(BUILD_CAFFE2 AND (NOT INTERN_BUILD_MOBILE OR BUILD_CAFFE2_MOBILE))
161
161
# add_subdirectory(test) # todo: use caffe2_gtest_main instead of gtest_main because we will need to call GlobalInit
162
162
add_subdirectory (transforms)
163
163
endif ()
164
- if (NOT BUILD_CAFFE2)
164
+ if (NOT BUILD_CAFFE2 AND ( NOT INTERN_BUILD_MOBILE OR BUILD_CAFFE2_MOBILE) )
165
165
add_subdirectory (proto)
166
166
endif ()
167
167
@@ -1817,7 +1817,7 @@ if(BUILD_TEST)
1817
1817
endif ()
1818
1818
1819
1819
# For special tests that explicitly uses dependencies, we add them here
1820
- if (USE_MPI)
1820
+ if (BUILD_CAFFE2 AND USE_MPI)
1821
1821
target_link_libraries (mpi_test ${MPI_CXX_LIBRARIES} )
1822
1822
if (USE_CUDA)
1823
1823
target_link_libraries (mpi_gpu_test ${MPI_CXX_LIBRARIES} )
You can’t perform that action at this time.
0 commit comments