Merge request #17 PhysX4 compatibilityv1.1.7_rc1

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

1 files changed, 19 insertions, 6 deletions

diff --git a/test/compiler/cmake/BlastPerfTests.cmake b/test/compiler/cmake/BlastPerfTests.cmake
index 2671ce1..660f47a 100755
--- a/test/compiler/cmake/BlastPerfTests.cmake
+++ b/test/compiler/cmake/BlastPerfTests.cmake
@@ -12,7 +12,8 @@ SET(COMMON_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/common)
 SET(SOLVER_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/lowlevel/source)

 

 

-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED)

+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)

+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)

 FIND_PACKAGE(GoogleTestNV $ENV{PM_GoogleTest-nv_VERSION} REQUIRED)

 

 

@@ -83,11 +84,11 @@ ADD_EXECUTABLE(BlastPerfTests
 	${SDK_SOLVER_FILES}

 )

 

-set_target_properties(BlastPerfTests 

-	PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}

-	CHECKED_POSTFIX ${CMAKE_CHECKED_POSTFIX}

-#	RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX}

-	PROFILE_POSTFIX ${CMAKE_PROFILE_POSTFIX}

+set_target_properties(BlastPerfTests PROPERTIES

+	DEBUG_POSTFIX "_${LIBPATH_SUFFIX}"

+	CHECKED_POSTFIX "_${LIBPATH_SUFFIX}"

+	RELEASE_POSTFIX "_${LIBPATH_SUFFIX}"

+	PROFILE_POSTFIX "_${LIBPATH_SUFFIX}"

 )

 

 

@@ -125,6 +126,18 @@ SET_TARGET_PROPERTIES(BlastPerfTests PROPERTIES
 	COMPILE_PDB_NAME_CHECKED "BlastPerfTests${CMAKE_CHECKED_POSTFIX}"

 	COMPILE_PDB_NAME_PROFILE "BlastPerfTests${CMAKE_PROFILE_POSTFIX}"

 	COMPILE_PDB_NAME_RELEASE "BlastPerfTests${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"

 )

 

 #TARGET_COMPILE_OPTIONS(BlastPerfTests PRIVATE /wd4005 /wd4244)