diff options
| author | Bryan Galdrikian <[email protected]> | 2018-01-22 14:04:16 -0800 |
|---|---|---|
| committer | Bryan Galdrikian <[email protected]> | 2018-01-22 14:04:16 -0800 |
| commit | 1dc1a87fba520bb45c1ce8165e8ea2c83c0a308d (patch) | |
| tree | 5f8ca75a6b92c60fb5cf3b14282fc4cc1c127eb2 /sdk/compiler/cmake/modules/FindPxSharedSDK.cmake | |
| parent | Updating readme.md to show updated UE4 Blast integration branches (diff) | |
| download | blast-1dc1a87fba520bb45c1ce8165e8ea2c83c0a308d.tar.xz blast-1dc1a87fba520bb45c1ce8165e8ea2c83c0a308d.zip | |
Changes for 1.1.2 release candidate
See README.md, docs/release_notes.txt
Diffstat (limited to 'sdk/compiler/cmake/modules/FindPxSharedSDK.cmake')
| -rw-r--r-- | sdk/compiler/cmake/modules/FindPxSharedSDK.cmake | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake index 0f67f5c..ff18af3 100644 --- a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake +++ b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake @@ -7,9 +7,11 @@ include(FindPackageHandleStandardArgs) # Find the includes -# TODO: Do the version stuff properly! +# Always try explicit PATH variable first find_path(PXSHAREDSDK_PATH include/foundation/Px.h PATHS + $ENV{PM_PxShared_PATH} + $ENV{PM_PhysX_PATH}/PxShared # multipack ${GW_DEPS_ROOT}/$ENV{PM_PxShared_NAME}/${PxSharedSDK_FIND_VERSION} ${GW_DEPS_ROOT}/PxShared/${PxSharedSDK_FIND_VERSION} ) @@ -33,37 +35,37 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows") # What compiler version do we want? if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0) - SET(VS_STR "vc12") + SET(VS_STR "VS2013") elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0) - SET(VS_STR "vc14") + SET(VS_STR "VS2015") else() MESSAGE(FATAL_ERROR "Failed to find compatible PxSharedSDK - Only supporting VS2013 and VS2015") endif() - SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX}) + SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../lib/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../lib) SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll") elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4") - SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14ps4-cmake) + SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14ps4-cmake ${PXSHAREDSDK_PATH}/../lib) SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") SET(CMAKE_FIND_LIBRARY_PREFIXES "lib") elseif(TARGET_BUILD_PLATFORM STREQUAL "XboxOne") - SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14xboxone-cmake) - SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") - SET(CMAKE_FIND_LIBRARY_PREFIXES "lib") + SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14xboxone-cmake ${PXSHAREDSDK_PATH}/../Lib) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib") + SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") elseif(TARGET_BUILD_PLATFORM STREQUAL "linux") - SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/linux64-cmake) + SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/linux64-cmake ${PXSHAREDSDK_PATH}/../Lib) SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") SET(CMAKE_FIND_LIBRARY_PREFIXES "lib") SET(PXSHARED_ARCH_FILE "_x64") endif() -# Now find all of the PhysX libs in the lib directory +# Now find all of the PxShared libs in the lib directory find_library(PSFASTXML_LIB - NAMES PsFastXml${PXSHARED_ARCH_FILE} + NAMES PsFastXml PsFastXml${PXSHARED_ARCH_FILE} PATHS ${LIB_PATH} ) find_library(PXFOUNDATION_LIB @@ -75,12 +77,12 @@ find_library(PXPVDSDK_LIB PATHS ${LIB_PATH} ) find_library(PXTASK_LIB - NAMES PxTask${PXSHARED_ARCH_FILE} + NAMES PxTask PxTask${PXSHARED_ARCH_FILE} PATHS ${LIB_PATH} ) find_library(PSFASTXML_LIB_DEBUG - NAMES PsFastXmlDEBUG${PXSHARED_ARCH_FILE} + NAMES PsFastXmlDEBUG PsFastXmlDEBUG${PXSHARED_ARCH_FILE} PATHS ${LIB_PATH} ) find_library(PXFOUNDATION_LIB_DEBUG @@ -92,7 +94,7 @@ find_library(PXPVDSDK_LIB_DEBUG PATHS ${LIB_PATH} ) find_library(PXTASK_LIB_DEBUG - NAMES PxTaskDEBUG${PXSHARED_ARCH_FILE} + NAMES PxTaskDEBUG PxTaskDEBUG${PXSHARED_ARCH_FILE} PATHS ${LIB_PATH} ) @@ -131,7 +133,7 @@ find_library(PXTASK_LIB_PROFILE ) if (TARGET_BUILD_PLATFORM STREQUAL "Windows") - SET(DLL_PATH ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX}) + SET(DLL_PATH ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../bin/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../bin) find_library(PXFOUNDATION_DLL NAMES PxFoundation${PXSHARED_ARCH_FILE} @@ -187,7 +189,7 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows") endif() if (TARGET_BUILD_PLATFORM STREQUAL "linux") - SET(BIN_PATH ${PXSHAREDSDK_PATH}/bin/linux64-cmake) + SET(BIN_PATH ${PXSHAREDSDK_PATH}/bin/linux64-cmake ${PXSHAREDSDK_PATH}/../Bin) SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so") find_library(PXFOUNDATION_LIB |