From f926177ae62e4e2e8f1eea3585680273386241e1 Mon Sep 17 00:00:00 2001 From: ervinzhang Date: Tue, 28 Jul 2020 13:25:26 -0400 Subject: [PATCH] fixed cpp build python dependecy --- mindspore/ccsrc/minddata/dataset/CMakeLists.txt | 14 ++++++++++++-- .../ccsrc/minddata/dataset/engine/CMakeLists.txt | 5 ++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt index 861caa85eb8..fb44afd0378 100644 --- a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -114,20 +114,30 @@ endif () add_dependencies(_c_dataengine generated_engine_files) +if (ENABLE_PYTHON) set_target_properties(_c_dataengine PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX "${PYTHON_MODULE_EXTENSION}" ) +endif() ###################################################################### ################# Link with external libraries ######################## target_link_libraries(_c_dataengine PRIVATE mindspore mindspore_gvar) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module ${PYTHON_LIBRARIES} mindspore::protobuf ${SECUREC_LIBRARY}) + if (ENABLE_PYTHON) + target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module ${PYTHON_LIBRARIES} mindspore::protobuf ${SECUREC_LIBRARY}) + else() + target_link_libraries(_c_dataengine PRIVATE mindspore::protobuf ${SECUREC_LIBRARY}) + endif() else() set(ICU_LIB mindspore::icuuc mindspore::icudata mindspore::icui18n) - target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module -ldl mindspore::protobuf ${SECUREC_LIBRARY}) + if (ENABLE_PYTHON) + target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module -ldl mindspore::protobuf ${SECUREC_LIBRARY}) + else() + target_link_libraries(_c_dataengine PRIVATE -ldl mindspore::protobuf ${SECUREC_LIBRARY}) + endif() endif() target_link_libraries(_c_dataengine PUBLIC mindspore::jpeg_turbo mindspore::opencv_core mindspore::opencv_imgcodecs mindspore::opencv_imgproc mindspore::tinyxml2 mindspore::sentencepiece mindspore::sentencepiece_train ${ICU_LIB}) diff --git a/mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt index e3ead16d057..b68251c6863 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt @@ -15,7 +15,10 @@ add_library(engine OBJECT data_schema.cc dataset_iterator.cc ) -target_include_directories(engine PRIVATE ${pybind11_INCLUDE_DIRS}) + +if (ENABLE_PYTHON) + target_include_directories(engine PRIVATE ${pybind11_INCLUDE_DIRS}) +endif() if (ENABLE_TDTQUE) add_dependencies(engine engine-datasetops engine-datasetops-source engine-tdt engine-opt engine-gnn engine-perf