forked from huawei/mindspore2022
Remove include_directories() in external_libs/
This commit is contained in:
Damien Nguyen
parent
80deb84e98
commit
dd065fa28b
|
|
@ -25,5 +25,3 @@ mindspore_add_pkg(
|
|||
TARGET_ALIAS mindspore::absl_raw_logging_internal absl::raw_logging_internal
|
||||
TARGET_ALIAS mindspore::absl_int128 absl::int128
|
||||
TARGET_ALIAS mindspore::absl_bad_optional_access absl::bad_optional_access)
|
||||
|
||||
include_directories(${absl_INC})
|
||||
|
|
|
|||
|
|
@ -16,5 +16,3 @@ mindspore_add_pkg(
|
|||
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release -DCARES_SHARED:BOOL=OFF -DCARES_STATIC:BOOL=ON
|
||||
-DCARES_STATIC_PIC:BOOL=ON -DHAVE_LIBNSL:BOOL=OFF
|
||||
TARGET_ALIAS mindspore::cares c-ares::cares)
|
||||
|
||||
include_directories(${c-ares_INC})
|
||||
|
|
|
|||
|
|
@ -19,5 +19,3 @@ mindspore_add_pkg(
|
|||
PATCHES ${TOP_DIR}/third_party/patch/cppjieba/cppjieba.patch001
|
||||
${TOP_DIR}/third_party/patch/cppjieba/cppjieba.patch002
|
||||
TARGET_ALIAS mindspore::cppjieba cppjieba::cppjieba)
|
||||
include_directories(${cppjieba_INC}include)
|
||||
include_directories(${cppjieba_INC}deps)
|
||||
|
|
|
|||
|
|
@ -11,8 +11,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5}
|
||||
CMAKE_OPTION -DBUILD_TESTING=OFF
|
||||
TARGET_ALIAS mindspore::eigen Eigen3::Eigen)
|
||||
if(NOT TARGET Eigen3::Eigen)
|
||||
message(FATAL_ERROR "Failed to find Eigen3::Eigen")
|
||||
endif()
|
||||
include_directories(${Eigen3_INC})
|
||||
include_directories(${EIGEN3_INCLUDE_DIR})
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ mindspore_add_pkg(
|
|||
TARGET_ALIAS mindspore::flatbuffers flatbuffers::${_flatbuffer_lib_name}
|
||||
TARGET_ALIAS mindspore::flatc flatbuffers::flatc)
|
||||
|
||||
include_directories(${flatbuffers_INC})
|
||||
|
||||
function(ms_build_flatbuffers source_schema_files source_schema_dirs custom_target_name generated_output_dir)
|
||||
set(total_schema_dirs "")
|
||||
set(total_generated_files "")
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ mindspore_add_pkg(
|
|||
PATCHES ${glog_patch}
|
||||
CMAKE_OPTION ${glog_option}
|
||||
TARGET_ALIAS mindspore::glog glog::glog)
|
||||
include_directories(${glog_INC})
|
||||
|
||||
if(NOT MS_PREFER_SYSTEM_PKGS AND NOT MS_GLOG_PREFER_SYSTEM)
|
||||
set(MS_PATCHED_GLOG_NAME
|
||||
|
|
|
|||
|
|
@ -99,8 +99,6 @@ mindspore_add_pkg(
|
|||
${_FINDPACKAGE_RE2_CONFIG_DIR}
|
||||
TARGET_ALIAS mindspore::grpc++ gRPC::grpc++)
|
||||
|
||||
include_directories(${grpc_INC})
|
||||
|
||||
# modify mindspore macro define
|
||||
add_compile_definitions(grpc=mindspore_grpc)
|
||||
add_compile_definitions(grpc_impl=mindspore_grpc_impl)
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ mindspore_add_pkg(
|
|||
TARGET_ALIAS mindspore::gtest GTest::gtest
|
||||
TARGET_ALIAS mindspore::gmock GTest::gmock)
|
||||
|
||||
include_directories(${gtest_INC})
|
||||
|
||||
foreach(_tgt GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main)
|
||||
foreach(_prop IMPORTED_LOCATION_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_NOCONFIG)
|
||||
get_target_property(_lib ${_tgt} ${_prop})
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ else()
|
|||
TARGET_ALIAS mindspore::icudata ICU::data
|
||||
TARGET_ALIAS mindspore::icui18n ICU::i18n)
|
||||
|
||||
include_directories(${icu4c_INC})
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT MS_ICU_PREFER_SYSTEM)
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/change_rpath.cmake)
|
||||
changerpath($<TARGET_FILE:ICU::uc> ${LIB_ICU_COMMON} "libicuuc;libicudata")
|
||||
|
|
|
|||
|
|
@ -56,4 +56,3 @@ mindspore_add_pkg(
|
|||
PATCHES ${JPEG_TURBO_PATCHE}
|
||||
TARGET_ALIAS mindspore::jpeg_turbo TurboJPEG::JPEG
|
||||
TARGET_ALIAS mindspore::turbojpeg TurboJPEG::TurboJPEG)
|
||||
include_directories(${jpeg_turbo_INC})
|
||||
|
|
|
|||
|
|
@ -25,4 +25,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5}
|
||||
CMAKE_OPTION -DBUILD_TESTING=OFF -DJSON_MultipleHeaders=ON
|
||||
TARGET_ALIAS mindspore::json nlohmann_json::nlohmann_json)
|
||||
include_directories(${nlohmann_json_INC})
|
||||
|
|
|
|||
|
|
@ -28,5 +28,3 @@ mindspore_add_pkg(
|
|||
TARGET_ALIAS mindspore::event_pthreads libevent::pthreads
|
||||
TARGET_ALIAS mindspore::event_core libevent::core
|
||||
TARGET_ALIAS mindspore::event_openssl libevent::openssl)
|
||||
|
||||
include_directories(${libevent_INC})
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ mindspore_add_pkg(
|
|||
-Dwebp=OFF
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
-Dlibdeflate=OFF)
|
||||
|
||||
set(tiff_INC "${TIFF_INCLUDE_DIR}")
|
||||
set(tiff_LIB "${TIFF_LIBRARIES}")
|
||||
|
||||
|
|
|
|||
|
|
@ -38,5 +38,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5} ${ARGS}
|
||||
TARGET_ALIAS mindspore::dnnl DNNL::dnnl
|
||||
TARGET_ALIAS mindspore::mkldnn DNNL::dnnl)
|
||||
|
||||
include_directories(${onednn_INC})
|
||||
|
|
|
|||
|
|
@ -17,4 +17,3 @@ mindspore_add_pkg(
|
|||
BUILD_OPTION_PASS_PREFIX
|
||||
GEN_CMAKE_CONFIG
|
||||
TARGET_ALIAS mindspore::nccl nccl::nccl)
|
||||
include_directories(${nccl_INC})
|
||||
|
|
|
|||
|
|
@ -17,4 +17,3 @@ mindspore_add_pkg(
|
|||
PRE_CONFIGURE_COMMAND ./autogen.pl
|
||||
CONFIGURE_COMMAND ./configure
|
||||
TARGET_ALIAS mindspore::ompi MPI::MPI_C)
|
||||
include_directories(${ompi_INC})
|
||||
|
|
|
|||
|
|
@ -76,11 +76,3 @@ mindspore_add_pkg(
|
|||
TARGET_ALIAS mindspore::opencv_core opencv_core
|
||||
TARGET_ALIAS mindspore::opencv_imgcodecs opencv_imgcodecs
|
||||
TARGET_ALIAS mindspore::opencv_imgproc opencv_imgproc)
|
||||
|
||||
if(MSVC)
|
||||
include_directories(${opencv_INC})
|
||||
elseif(WIN32)
|
||||
include_directories(${opencv_INC})
|
||||
else()
|
||||
include_directories(${opencv_INC}/opencv4)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -24,5 +24,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR APPLE)
|
|||
GEN_CMAKE_CONFIG
|
||||
TARGET_ALIAS mindspore::ssl OpenSSL::SSL
|
||||
TARGET_ALIAS mindspore::crypto OpenSSL::Crypto)
|
||||
include_directories(${openssl_INC})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ mindspore_add_pkg(
|
|||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
||||
TARGET_ALIAS mindspore::protobuf protobuf::libprotobuf)
|
||||
|
||||
include_directories(${protobuf_INC})
|
||||
set(CMAKE_CXX_FLAGS ${_ms_tmp_CMAKE_CXX_FLAGS})
|
||||
if(MSVC)
|
||||
set(CMAKE_STATIC_LIBRARY_PREFIX, ${_ms_tmp_CMAKE_STATIC_LIBRARY_PREFIX})
|
||||
|
|
|
|||
|
|
@ -41,4 +41,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5}
|
||||
CMAKE_OPTION -DPYBIND11_TEST=OFF -DPYBIND11_LTO_CXX_FLAGS=FALSE
|
||||
TARGET_ALIAS mindspore::pybind11_module pybind11::module)
|
||||
include_directories(${pybind11_INC})
|
||||
|
|
|
|||
|
|
@ -20,5 +20,3 @@ mindspore_add_pkg(
|
|||
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release -DRE2_BUILD_TESTING:BOOL=OFF
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
|
||||
TARGET_ALIAS mindspore::re2 re2::re2)
|
||||
|
||||
include_directories(${re2_INC})
|
||||
|
|
|
|||
|
|
@ -42,5 +42,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5} ${PATCHES}
|
||||
TARGET_ALIAS mindspore::sentencepiece sentencepiece::sentencepiece
|
||||
TARGET_ALIAS mindspore::sentencepiece_train sentencepiece::sentencepiece_train)
|
||||
|
||||
include_directories(${sentencepiece_INC})
|
||||
|
|
|
|||
|
|
@ -33,5 +33,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5} ${PATCHES} ${CONFIGURE_COMMAND}
|
||||
GEN_CMAKE_CONFIG
|
||||
TARGET_ALIAS mindspore::sqlite SQLite::SQLite3)
|
||||
|
||||
include_directories(${sqlite_INC})
|
||||
|
|
|
|||
|
|
@ -22,4 +22,3 @@ mindspore_add_pkg(
|
|||
CMAKE_PKG_NO_COMPONENTS
|
||||
MD5 ${MD5}
|
||||
TARGET_ALIAS mindspore::tinyxml2 tinyxml2::tinyxml2)
|
||||
include_directories(${tinyxml2_INC})
|
||||
|
|
|
|||
|
|
@ -16,5 +16,3 @@ mindspore_add_pkg(
|
|||
MD5 ${MD5}
|
||||
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release
|
||||
TARGET_ALIAS mindspore::z ZLIB::ZLIB)
|
||||
|
||||
include_directories(${zlib_INC})
|
||||
|
|
|
|||
Loading…
Reference in New Issue