diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 0b864d4c..9e180db1 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -158,23 +158,12 @@ set_target_properties(SPVRemapper PROPERTIES set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen) ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_static.a -) -add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a -) -set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation) diff --git a/ios-m1-simulator/CMakeLists.txt b/ios-m1-simulator/CMakeLists.txt index 00d50424..f56b4bde 100644 --- a/ios-m1-simulator/CMakeLists.txt +++ b/ios-m1-simulator/CMakeLists.txt @@ -169,23 +169,12 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a -) -add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a -) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) ## PHYSICS_PHYSX do not support simulator # if(USE_PHYSICS_PHYSX) diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index 4dd81988..b060ad83 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -165,23 +165,12 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a -) -add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a -) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index 4dfba354..465a31aa 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -167,23 +167,12 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a -) -add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a -) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 8dedaf8b..e5414b2a 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -210,26 +210,13 @@ foreach(gl IN LISTS glslang_libs_name) endforeach() ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb SHARED IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib ) -add_library(tbbmalloc SHARED IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib -) -add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib -) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 5f7477f3..d3a07663 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -209,26 +209,13 @@ foreach(gl IN LISTS glslang_libs_name) ) endforeach() ############################# TBB ############################# -if(USE_JOB_SYSTEM_TBB) + add_library(tbb SHARED IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib ) -add_library(tbbmalloc SHARED IMPORTED GLOBAL) -set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib -) -add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL) -set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib -) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) -else() - set(tbb_libs_name) -endif() +set(tbb_libs_name tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)