1 files changed, 16 insertions, 9 deletions
diff --git a/sdk/compiler/cmake/NvBlastExtImport.cmake b/sdk/compiler/cmake/NvBlastExtImport.cmake
index f694d98..32ebf80 100755
--- a/sdk/compiler/cmake/NvBlastExtImport.cmake
+++ b/sdk/compiler/cmake/NvBlastExtImport.cmake
@@ -13,8 +13,8 @@ SET(PHYSX_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/include)
 
 SET(APEX_MODULES_DIR ${PROJECT_SOURCE_DIR}/extensions/import/apexmodules)
 
-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)
 
 # 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}/NvBlastExtImport.cmake)
@@ -77,7 +77,8 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtImport
 
 	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
-	
+	PUBLIC ${BLAST_ROOT_DIR}/shared/filebuf/include
+
 	PRIVATE ${APEX_MODULES_DIR}/modules/common/include/autogen
 	PRIVATE ${APEX_MODULES_DIR}/modules/common/include
 	PRIVATE ${APEX_MODULES_DIR}/modules/common_legacy/include/autogen
@@ -112,15 +113,21 @@ SET_TARGET_PROPERTIES(NvBlastExtImport PROPERTIES
 	PDB_NAME_CHECKED "NvBlastExtImport${CMAKE_CHECKED_POSTFIX}"
 	PDB_NAME_PROFILE "NvBlastExtImport${CMAKE_PROFILE_POSTFIX}"
 	PDB_NAME_RELEASE "NvBlastExtImport${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(NvBlastExtImport 
 	PRIVATE NvBlast NvBlastTk NvBlastExtAuthoring
 	PUBLIC ${BLASTEXT_PLATFORM_LINKED_LIBS}
-	PUBLIC $<$<CONFIG:debug>:${PSFASTXML_LIB_DEBUG}>
-	PUBLIC $<$<CONFIG:checked>:${PSFASTXML_LIB_CHECKED}>
-	PUBLIC $<$<CONFIG:profile>:${PSFASTXML_LIB_PROFILE}>
-	PUBLIC $<$<CONFIG:release>:${PSFASTXML_LIB}>
-	
 )