From 3ade5ba374dd4e83ef3ca1699e7c9d59dca3bb7b Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Fri, 30 Jul 2021 14:58:19 +0800 Subject: [PATCH] fix physx location (#166) --- win32/CMakeLists.txt | 42 ++++++++++++++---------------------------- win64/CMakeLists.txt | 2 +- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 63a40f5c..7ed42987 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -197,62 +197,52 @@ endif() add_library(GenericCodeGen STATIC IMPORTED GLOBAL) set_target_properties(GenericCodeGen PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGend.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib ) add_library(glslang STATIC IMPORTED GLOBAL) set_target_properties(glslang PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslangd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib ) add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL) set_target_properties(glslang-default-resource-limits PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limitsd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib ) add_library(MachineIndependent STATIC IMPORTED GLOBAL) set_target_properties(MachineIndependent PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependentd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib ) add_library(OGLCompiler STATIC IMPORTED GLOBAL) set_target_properties(OGLCompiler PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompilerd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib ) add_library(OSDependent STATIC IMPORTED GLOBAL) set_target_properties(OSDependent PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependentd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib ) add_library(SPIRV STATIC IMPORTED GLOBAL) set_target_properties(SPIRV PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRVd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib ) add_library(SPIRV-Tools STATIC IMPORTED GLOBAL) set_target_properties(SPIRV-Tools PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Toolsd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib ) add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL) set_target_properties(SPIRV-Tools-opt PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-optd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib ) add_library(SPVRemapper STATIC IMPORTED GLOBAL) set_target_properties(SPVRemapper PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapperd.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib ) set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen) @@ -261,18 +251,15 @@ set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbb_static_debug.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbb_static.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbb_static.lib ) add_library(tbbmalloc STATIC IMPORTED GLOBAL) set_target_properties(tbbmalloc PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_static_debug.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_static.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_static.lib ) add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) set_target_properties(tbbmalloc_proxy PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_proxy_static_debug.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_proxy_static.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb/tbbmalloc_proxy_static.lib ) set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) @@ -283,8 +270,7 @@ if(USE_PHYSICS_PHYSX) foreach(PX IN LISTS PhysXSDK) add_library(${PX} STATIC IMPORTED GLOBAL) set_target_properties(${PX} PROPERTIES - IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/debug/${PX}_static_32.lib - IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_32.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/${PX}_static_32.lib ) endforeach() else() diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 7e1d2a62..94fff745 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -270,7 +270,7 @@ if(USE_PHYSICS_PHYSX) foreach(PX IN LISTS PhysXSDK) add_library(${PX} STATIC IMPORTED GLOBAL) set_target_properties(${PX} PROPERTIES - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/${PX}_static_64.lib ) endforeach() else()