From 3943a7d3b62c5f9998a1729477eea5b9519e1084 Mon Sep 17 00:00:00 2001 From: yangchao <1162485779@qq.com> Date: Tue, 25 Jan 2022 17:57:10 +0800 Subject: [PATCH] config cmake --- ohos/CMakeLists.txt | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/ohos/CMakeLists.txt b/ohos/CMakeLists.txt index be7364b6..00491fa5 100644 --- a/ohos/CMakeLists.txt +++ b/ohos/CMakeLists.txt @@ -140,7 +140,19 @@ add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL) set_target_properties(glslang-default-resource-limits PROPERTIES IMPORTED_LOCATION ${ohos_lib_dir}/libglslang-default-resource-limits.a ) -set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits) +set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits MachineIndependent GenericCodeGen) + +if(OPENHARMONY) +add_library(MachineIndependent STATIC IMPORTED GLOBAL) +set_target_properties(MachineIndependent PROPERTIES + IMPORTED_LOCATION ${ohos_lib_dir}/libMachineIndependent.a +) +add_library(GenericCodeGen STATIC IMPORTED GLOBAL) +set_target_properties(GenericCodeGen PROPERTIES + IMPORTED_LOCATION ${ohos_lib_dir}/libGenericCodeGen.a +) +list(APPEND glslang_libs_name MachineIndependent GenericCodeGen) +endif() ############################# TBB ############################# @@ -167,14 +179,19 @@ list(APPEND CC_EXTERNAL_LIBS freetype jpeg png - webp sqlite3 - ${se_libs_name} ${glslang_libs_name} - OpenALSoft - mpg123 ) +if(NOT OPENHARMONY) +list(APPEND CC_EXTERNAL_LIBS +webp +${se_libs_name} +OpenALSoft +mpg123 +) +endif() + set(ZLIB z) if(NOT USE_MODULES) list(APPEND CC_EXTERNAL_LIBS ${ZLIB}) @@ -190,6 +207,9 @@ endif() list(APPEND CC_EXTERNAL_INCLUDES ${platform_spec_path}/include ${platform_spec_path}/include/v8 + ${platform_spec_path}/include/sqlite + ${platform_spec_path}/include/png16 + ${platform_spec_path}/include/uv ) #TODO: remove in future version