Adding OUTPUT_NAME to physics gems shared libraries to avoid conflicting with their 3rdParty libraries

This commit is contained in:
Aaron Ruiz Mora
2021-04-29 18:00:06 +01:00
committed by GitHub
parent 80833caf2b
commit 771a7a25aa
4 changed files with 14 additions and 4 deletions
+4 -1
View File
@@ -43,6 +43,7 @@ ly_add_target(
ly_add_target(
NAME Blast ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Blast.Gem
FILES_CMAKE
blast_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -89,8 +90,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME Blast.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Blast.Editor.Gem
AUTOMOC
FILES_CMAKE
blast_editor_shared_files.cmake
@@ -119,6 +120,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME Blast.Tests MODULE
NAMESPACE Gem
OUTPUT_NAME Blast.Tests.Gem
FILES_CMAKE
blast_tests_files.cmake
INCLUDE_DIRECTORIES
@@ -142,6 +144,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME Blast.Editor.Tests MODULE
NAMESPACE Gem
OUTPUT_NAME Blast.Editor.Tests.Gem
FILES_CMAKE
blast_editor_tests_files.cmake
INCLUDE_DIRECTORIES
+4 -1
View File
@@ -43,6 +43,7 @@ ly_add_target(
ly_add_target(
NAME NvCloth ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME NvCloth.Gem
FILES_CMAKE
nvcloth_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -83,8 +84,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME NvCloth.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME NvCloth.Editor.Gem
FILES_CMAKE
nvcloth_editor_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -109,6 +110,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME NvCloth.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
NAMESPACE Gem
OUTPUT_NAME NvCloth.Tests.Gem
FILES_CMAKE
nvcloth_tests_files.cmake
INCLUDE_DIRECTORIES
@@ -134,6 +136,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME NvCloth.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
NAMESPACE Gem
OUTPUT_NAME NvCloth.Editor.Tests.Gem
FILES_CMAKE
nvcloth_editor_tests_files.cmake
INCLUDE_DIRECTORIES
+4 -1
View File
@@ -52,6 +52,7 @@ ly_add_target(
ly_add_target(
NAME PhysX ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME PhysX.Gem
FILES_CMAKE
${physx_shared_files}
COMPILE_DEFINITIONS
@@ -118,8 +119,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME PhysX.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME PhysX.Editor.Gem
AUTOMOC
FILES_CMAKE
physx_editor_shared_files.cmake
@@ -147,6 +148,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME PhysX.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
NAMESPACE Gem
OUTPUT_NAME PhysX.Tests.Gem
FILES_CMAKE
physx_tests_files.cmake
INCLUDE_DIRECTORIES
@@ -175,6 +177,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_add_target(
NAME PhysX.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
NAMESPACE Gem
OUTPUT_NAME PhysX.Editor.Tests.Gem
FILES_CMAKE
physx_editor_tests_files.cmake
INCLUDE_DIRECTORIES
+2 -1
View File
@@ -25,6 +25,7 @@ endif()
ly_add_target(
NAME PhysXDebug ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME PhysXDebug.Gem
FILES_CMAKE
${physx_files}
INCLUDE_DIRECTORIES
@@ -47,8 +48,8 @@ ly_add_target(
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME PhysXDebug.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME PhysXDebug.Editor.Gem
FILES_CMAKE
${physx_editor_files}
COMPILE_DEFINITIONS