Skip to content

Commit 4c091e0

Browse files
authored
Support defined ONNX_ML in parent cmake files (onnx#1821)
1 parent 57372f3 commit 4c091e0

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

CMakeLists.txt

+7-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ option(ONNX_COVERAGE "Build with coverage instrumentation" OFF)
2424
option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" OFF)
2525
option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
2626
option(ONNXIFI_ENABLE_EXT "Enable onnxifi extensions." OFF)
27-
if(DEFINED ENV{ONNX_ML})
28-
set(DEFAULT_ONNX_ML $ENV{ONNX_ML})
29-
else()
30-
set(DEFAULT_ONNX_ML ON)
27+
if(NOT DEFINED ONNX_ML)
28+
if(DEFINED ENV{ONNX_ML})
29+
set(DEFAULT_ONNX_ML $ENV{ONNX_ML})
30+
else()
31+
set(DEFAULT_ONNX_ML ON)
32+
endif()
33+
option(ONNX_ML "Enable traditional ML API." ${DEFAULT_ONNX_ML})
3134
endif()
32-
option(ONNX_ML "Enable traditional ML API." ${DEFAULT_ONNX_ML})
3335
option(ONNXIFI_DUMMY_BACKEND "Use dummy backend in onnxifi test driver." OFF)
3436

3537
# Set C++11 as standard for the whole project

0 commit comments

Comments
 (0)