Merge request #17 PhysX4 compatibilityv1.1.7_rc1

Other changes for linux and UE4CrossCompileLinux, and all packaging to work

1 files changed, 15 insertions, 1 deletions

diff --git a/sdk/compiler/cmake/NvBlastExtSerialization.cmake b/sdk/compiler/cmake/NvBlastExtSerialization.cmake
index a2679bc..0a22aef 100755
--- a/sdk/compiler/cmake/NvBlastExtSerialization.cmake
+++ b/sdk/compiler/cmake/NvBlastExtSerialization.cmake
@@ -13,7 +13,8 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source)
 

 SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated)

 

-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.

@@ -129,6 +130,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtSerialization
 	PRIVATE ${COMMON_SOURCE_DIR}

 

 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}

+	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}

 )

 

 TARGET_COMPILE_DEFINITIONS(NvBlastExtSerialization

@@ -146,6 +148,18 @@ SET_TARGET_PROPERTIES(NvBlastExtSerialization PROPERTIES
 	PDB_NAME_CHECKED "NvBlastExtSerialization${CMAKE_CHECKED_POSTFIX}"

 	PDB_NAME_PROFILE "NvBlastExtSerialization${CMAKE_PROFILE_POSTFIX}"

 	PDB_NAME_RELEASE "NvBlastExtSerialization${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