From 5427a67c966cfcf2efc02713de7a5e90532151ab Mon Sep 17 00:00:00 2001 From: Megvii Engine Team Date: Thu, 27 May 2021 13:53:23 +0800 Subject: [PATCH] fix(cmake/subdirectory): fix project import by other sdk by add-subdirectory notice: if you are cross build, please follow step ---- define SRC_DIR you sdk root dir SRC_DIR=$($READLINK -f "`dirname $0`") source $SRC_DIR/megbrain/scripts/cmake-build/utils/utils.sh build_flatc $SRC_DIR/megbrain false your build code ---- GitOrigin-RevId: ad97860f5ffc1128a8c177f0822c02e240634716 --- cmake/FetchMegBrainVersion.cmake | 2 +- scripts/cmake-build/utils/utils.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/FetchMegBrainVersion.cmake b/cmake/FetchMegBrainVersion.cmake index b6f0992b..5c625bb6 100644 --- a/cmake/FetchMegBrainVersion.cmake +++ b/cmake/FetchMegBrainVersion.cmake @@ -7,7 +7,7 @@ # MGB_VER_STRING: Version string option(MGB_FORCE_DEV_VERSION "Force -dev tag in version stamp" OFF) -file (READ "${CMAKE_SOURCE_DIR}/src/core/include/megbrain/version.h" content) +file (READ "${CMAKE_CURRENT_SOURCE_DIR}/src/core/include/megbrain/version.h" content) string (REGEX MATCH "MGB_MAJOR +([0-9]+)" _ ${content}) set (MGB_VER_MAJOR ${CMAKE_MATCH_1}) diff --git a/scripts/cmake-build/utils/utils.sh b/scripts/cmake-build/utils/utils.sh index fae31f1f..35fe7ebf 100755 --- a/scripts/cmake-build/utils/utils.sh +++ b/scripts/cmake-build/utils/utils.sh @@ -15,6 +15,7 @@ if [ $OS = "Darwin" ];then READLINK=greadlink fi +PROJECT_DIR=$(dirname "${BASH_SOURCE[0]}")/../../../ function cd_real_build_dir() { REAL_DIR=$($READLINK -f $1) echo "may alias dir: $1" @@ -46,7 +47,7 @@ function build_flatc() { -DFLATBUFFERS_BUILD_FLATHASH=OFF \ -DFLATBUFFERS_BUILD_FLATLIB=OFF \ -DFLATBUFFERS_LIBCXX_WITH_CLANG=OFF \ - $SRC_DIR/third_party/flatbuffers + ${PROJECT_DIR}/third_party/flatbuffers ${NINJA_BASE} all ${NINJA_BASE} install/strip -- GitLab