From d61c455a4775f966b44cc47804b9e0f160d3d332 Mon Sep 17 00:00:00 2001 From: bgaldrikian Date: Tue, 10 Nov 2020 20:53:31 -0800 Subject: Merge request #17 PhysX4 compatibility Other changes for linux and UE4CrossCompileLinux, and all packaging to work --- sdk/compiler/cmake/NvBlastExtPxSerialization.cmake | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'sdk/compiler/cmake/NvBlastExtPxSerialization.cmake') diff --git a/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake b/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake index a781d87..e2bd2a1 100755 --- a/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake +++ b/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake @@ -18,8 +18,8 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source) SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated) -FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED) -FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED) +FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED) +FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED) FIND_PACKAGE(CapnProtoSDK $ENV{PM_CapnProto_VERSION} REQUIRED) # Include here after the directories are defined so that the platform specific file can use the variables. @@ -172,7 +172,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtPxSerialization PRIVATE ${COMMON_SOURCE_DIR} - PUBLIC ${PHYSXSDK_INCLUDE_DIRS} + PRIVATE ${PHYSXSDK_INCLUDE_DIRS} PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} ) @@ -186,20 +186,32 @@ TARGET_COMPILE_OPTIONS(NvBlastExtPxSerialization PRIVATE ${BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS} ) -SET_TARGET_PROPERTIES(NvBlastExtPxSerialization PROPERTIES +SET_TARGET_PROPERTIES(NvBlastExtPxSerialization PROPERTIES PDB_NAME_DEBUG "NvBlastExtPxSerialization${CMAKE_DEBUG_POSTFIX}" PDB_NAME_CHECKED "NvBlastExtPxSerialization${CMAKE_CHECKED_POSTFIX}" PDB_NAME_PROFILE "NvBlastExtPxSerialization${CMAKE_PROFILE_POSTFIX}" PDB_NAME_RELEASE "NvBlastExtPxSerialization${CMAKE_RELEASE_POSTFIX}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug" + ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked" + LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked" + RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked" + ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile" + LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile" + RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release" ) # Do final direct sets after the target has been defined TARGET_LINK_LIBRARIES(NvBlastExtPxSerialization PRIVATE NvBlast NvBlastGlobals NvBlastTk NvBlastExtPhysX ${CAPNPROTOSDK_LIBRARIES} - PUBLIC $<$:${PHYSX3_LIB_DEBUG}> $<$:${PHYSX3COOKING_LIB_DEBUG}> - PUBLIC $<$:${PHYSX3_LIB_CHECKED}> $<$:${PHYSX3COOKING_LIB_CHECKED}> - PUBLIC $<$:${PHYSX3_LIB_PROFILE}> $<$:${PHYSX3COOKING_LIB_PROFILE}> - PUBLIC $<$:${PHYSX3_LIB}> $<$:${PHYSX3COOKING_LIB}> + PUBLIC $<$:${PHYSX_LIB_DEBUG}> $<$:${PHYSXCOOKING_LIB_DEBUG}> + PUBLIC $<$:${PHYSX_LIB_CHECKED}> $<$:${PHYSXCOOKING_LIB_CHECKED}> + PUBLIC $<$:${PHYSX_LIB_PROFILE}> $<$:${PHYSXCOOKING_LIB_PROFILE}> + PUBLIC $<$:${PHYSX_LIB}> $<$:${PHYSXCOOKING_LIB}> ) #Hack for now to force these to build serialially to fix fighting over writing the generated code -- cgit v1.2.3