Browse Source

fix(cmake): fix cmake build failed at soft link workspace

GitOrigin-RevId: 78b50a4f3a
tags/v1.4.0-rc1
Megvii Engine Team 4 years ago
parent
commit
3ea00ebab1
5 changed files with 18 additions and 6 deletions
  1. +1
    -1
      scripts/cmake-build/cross_build_android_arm_inference.sh
  2. +1
    -1
      scripts/cmake-build/cross_build_ios_arm_inference.sh
  3. +1
    -1
      scripts/cmake-build/cross_build_linux_arm_inference.sh
  4. +2
    -2
      scripts/cmake-build/host_build.sh
  5. +13
    -1
      scripts/cmake-build/utils/utils.sh

+ 1
- 1
scripts/cmake-build/cross_build_android_arm_inference.sh View File

@@ -111,7 +111,7 @@ function cmake_build() {
echo "create build dir"
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
unset IFS
cmake -G "$MAKEFILE_TYPE Makefiles" \
-DCMAKE_TOOLCHAIN_FILE="$NDK_ROOT/build/cmake/android.toolchain.cmake" \


+ 1
- 1
scripts/cmake-build/cross_build_ios_arm_inference.sh View File

@@ -108,7 +108,7 @@ function cmake_build() {
echo "create build dir"
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
cmake -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DIOS_TOOLCHAIN_ROOT=$TOOLCHAIN \


+ 1
- 1
scripts/cmake-build/cross_build_linux_arm_inference.sh View File

@@ -131,7 +131,7 @@ function cmake_build() {
echo "create build dir"
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
cmake -G "$MAKEFILE_TYPE Makefiles" \
-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS \
-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS \


+ 2
- 2
scripts/cmake-build/host_build.sh View File

@@ -97,7 +97,7 @@ function cmake_build() {
echo "create build dir"
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
cmake \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DMGE_INFERENCE_ONLY=$MGE_INFERENCE_ONLY \
@@ -229,7 +229,7 @@ function cmake_build_windows() {
echo "create build dir"
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR
cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
echo "now try build windows native with cmake/clang-ci/Ninja/Visual Studio ....."
export CFLAGS=-$MGE_WINDOWS_BUILD_MARCH
export CXXFLAGS=-$MGE_WINDOWS_BUILD_MARCH


+ 13
- 1
scripts/cmake-build/utils/utils.sh View File

@@ -9,6 +9,18 @@ if [[ $OS =~ "NT" ]]; then
MAKEFILE_TYPE="Unix"
fi

READLINK=readlink
if [ $OS = "Darwin" ];then
READLINK=greadlink
fi

function cd_real_build_dir() {
REAL_DIR=$($READLINK -f $1)
echo "may alias dir: $1"
echo "cd real build dir: ${REAL_DIR}"
cd ${REAL_DIR}
}

function build_flatc() {
BUILD_DIR=$1/build_dir/host_flatc/build
INSTALL_DIR=$BUILD_DIR/../install
@@ -25,7 +37,7 @@ function build_flatc() {
mkdir -p $BUILD_DIR
mkdir -p $INSTALL_DIR

cd $BUILD_DIR
cd_real_build_dir $BUILD_DIR
cmake -G "$MAKEFILE_TYPE Makefiles" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \


Loading…
Cancel
Save