From 4f972469ffb9170eeaff83d8f197b8807a6b5a96 Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Fri, 12 Nov 2021 11:46:34 +0800 Subject: [PATCH] fix glslang link order (#198) --- android/CMakeLists.txt | 53 ++++++------------------------------------ win32/CMakeLists.txt | 2 +- win64/CMakeLists.txt | 3 ++- 3 files changed, 10 insertions(+), 48 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 43dfe2be..2c01b41f 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -105,52 +105,13 @@ endif() ############################# glslang ############################# -add_library(GenericCodeGen STATIC IMPORTED GLOBAL) -set_target_properties(GenericCodeGen PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libGenericCodeGen.a -) - -add_library(glslang STATIC IMPORTED GLOBAL) -set_target_properties(glslang PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libglslang.a -) - -add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL) -set_target_properties(glslang-default-resource-limits PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libglslang-default-resource-limits.a -) - -add_library(MachineIndependent STATIC IMPORTED GLOBAL) -set_target_properties(MachineIndependent PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libMachineIndependent.a -) - -add_library(OGLCompiler STATIC IMPORTED GLOBAL) -set_target_properties(OGLCompiler PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libOGLCompiler.a -) - -add_library(OSDependent STATIC IMPORTED GLOBAL) -set_target_properties(OSDependent PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libOSDependent.a -) - -add_library(SPIRV STATIC IMPORTED GLOBAL) -set_target_properties(SPIRV PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV.a -) - -add_library(SPIRV-Tools STATIC IMPORTED GLOBAL) -set_target_properties(SPIRV-Tools PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools.a -) - -add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL) -set_target_properties(SPIRV-Tools-opt PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools-opt.a -) - -set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) +foreach(lib IN LISTS glslang_libs_name) + add_library(${lib} STATIC IMPORTED GLOBAL) + set_target_properties(${lib} PROPERTIES + IMPORTED_LOCATION ${platform_spec_path}/glslang/lib${lib}.a + ) +endforeach() ############################# TBB ############################# diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 42ab6b59..ba47503b 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -200,7 +200,7 @@ endif() ############################# glslang ############################# -set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) foreach(gl IN LISTS glslang_libs_name) add_library(${gl} STATIC IMPORTED GLOBAL) set_target_properties(${gl} PROPERTIES diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index d2c88693..317075bb 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -200,7 +200,7 @@ endif() ############################# glslang ############################# -set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) foreach(gl IN LISTS glslang_libs_name) add_library(${gl} STATIC IMPORTED GLOBAL) set_target_properties(${gl} PROPERTIES @@ -208,6 +208,7 @@ foreach(gl IN LISTS glslang_libs_name) IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib ) endforeach() + ############################# TBB ############################# add_library(tbb SHARED IMPORTED GLOBAL)