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/NvBlastTk.cmake b/sdk/compiler/cmake/NvBlastTk.cmake
index 2eb6a32..c317d78 100755
--- a/sdk/compiler/cmake/NvBlastTk.cmake
+++ b/sdk/compiler/cmake/NvBlastTk.cmake
@@ -5,7 +5,8 @@
 SET(TOOLKIT_DIR ${PROJECT_SOURCE_DIR}/toolkit)

 SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)

 

-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)

+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)

+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)

 

 # Include here after the directories are defined so that the platform specific file can use the variables.

 include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastTk.cmake)

@@ -92,6 +93,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastTk
 	PUBLIC ${PROJECT_SOURCE_DIR}/toolkit/include

 	

 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}

+	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}

 )

 

 TARGET_COMPILE_DEFINITIONS(NvBlastTk 

@@ -107,6 +109,18 @@ SET_TARGET_PROPERTIES(NvBlastTk PROPERTIES
 	PDB_NAME_CHECKED "NvBlastTk${CMAKE_CHECKED_POSTFIX}"

 	PDB_NAME_PROFILE "NvBlastTk${CMAKE_PROFILE_POSTFIX}"

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