From af19dae19feac8cc053b4c5f1d172d9f327139ad Mon Sep 17 00:00:00 2001 From: ervinzhang Date: Fri, 7 Aug 2020 09:15:09 -0400 Subject: [PATCH] fixed minddata lite build issues --- mindspore/lite/CMakeLists.txt | 4 ++++ mindspore/lite/minddata/CMakeLists.txt | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 76808d7506..b11adfbbb0 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -133,6 +133,10 @@ if (BUILD_MINDDATA) set(OpenCV_DIR ${TOP_DIR}/third_party/opencv/build) find_package(OpenCV REQUIRED) include_directories(${OpenCV_INCLUDE_DIRS}) + # json + if (NOT BUILD_CONVERTER) + include(${TOP_DIR}/cmake/external_libs/json.cmake) + endif() # eigen include_directories(${TOP_DIR}/third_party/eigen/) # jpeg-turbo diff --git a/mindspore/lite/minddata/CMakeLists.txt b/mindspore/lite/minddata/CMakeLists.txt index fcf6d721a9..d825f87f54 100644 --- a/mindspore/lite/minddata/CMakeLists.txt +++ b/mindspore/lite/minddata/CMakeLists.txt @@ -4,9 +4,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb") -if (CMAKE_BUILD_TYPE EQUAL "DEBUG") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -s") -endif() +set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} -s") AUX_SOURCE_DIRECTORY(${MINDDATA_DIR}/core MINDDATA_CORE_SRC_FILES) list(REMOVE_ITEM MINDDATA_CORE_SRC_FILES "${MINDDATA_DIR}/core/client.cc")