afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cond

This commit is contained in:
Arnold 2021-08-03 12:07:49 +08:00
parent 97697403cc
commit 701ceab20b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ohos/CMakeLists.txt
View File

@ -144,7 +144,7 @@ set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-reso
############################# TBB ############################# ############################# TBB #############################
if(USE_JOB_SYSTEM_TASKFLOW) if(USE_JOB_SYSTEM_TBB)
add_library(tbb STATIC IMPORTED GLOBAL) add_library(tbb STATIC IMPORTED GLOBAL)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${ohos_lib_dir}/libtbb_static.a IMPORTED_LOCATION ${ohos_lib_dir}/libtbb_static.a
@ -158,6 +158,9 @@ if(USE_JOB_SYSTEM_TASKFLOW)
IMPORTED_LOCATION ${ohos_lib_dir}/libtbbmalloc_proxy_static.a IMPORTED_LOCATION ${ohos_lib_dir}/libtbbmalloc_proxy_static.a
) )
set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb) set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb)
list(APPEND CC_EXTERNAL_LIBS
${tbb_libs_name}
)
endif() endif()
list(APPEND CC_EXTERNAL_LIBS list(APPEND CC_EXTERNAL_LIBS
@ -172,12 +175,6 @@ list(APPEND CC_EXTERNAL_LIBS
mpg123 mpg123
) )
if(USE_JOB_SYSTEM_TASKFLOW)
list(APPEND CC_EXTERNAL_LIBS
${tbb_libs_name}
)
endif()
set(ZLIB z) set(ZLIB z)
if(NOT USE_MODULES) if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB}) list(APPEND CC_EXTERNAL_LIBS ${ZLIB})