From c039f3c33801b4c87ffe4095c8073d5278f11188 Mon Sep 17 00:00:00 2001 From: philippelatulippe Date: Sat, 23 Apr 2011 15:08:57 -0400 Subject: [PATCH] cmake: Don't search for PhysX 2.6.4 on linux, remove 'SDKs' directory from PhysX find_path() --- cmake/FindPhysX.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/FindPhysX.cmake b/cmake/FindPhysX.cmake index 6ec17b00..0b282e09 100644 --- a/cmake/FindPhysX.cmake +++ b/cmake/FindPhysX.cmake @@ -6,11 +6,10 @@ endif() #This isn't quite right, but we'll assume they are all at the same place. -find_path(PHYSX_SDK_PATH SDKs/Cooking/Include/NxCooking.h +find_path(PHYSX_SDK_PATH Cooking/Include/NxCooking.h /usr/local/include /usr/include - PATH_SUFFIXES "PhysX/v2.6.4" - PATH_SUFFIXES "PhysX/v2.7.3" + PATH_SUFFIXES "PhysX/v2.7.3/SDKs" ) if(PHYSX_SDK_PATH) @@ -35,17 +34,14 @@ endif() #2.7.3 is the earliest version that can be downloaded from nVidia's archive. find_library(PHYSX_COOKING_LIBRARY NAMES NxCooking - PATH_SUFFIXES "PhysX/v2.6.4" PATH_SUFFIXES "PhysX/v2.7.3" PATHS "${PHYSX_SDK_PATH}/lib/win32" ) find_library(PHYSX_CHARACTER_LIBRARY NAMES NxCharacter - PATH_SUFFIXES "PhysX/v2.6.4" PATH_SUFFIXES "PhysX/v2.7.3" PATHS "${PHYSX_SDK_PATH}/lib/win32" ) find_library(PHYSX_EXTENSIONS_LIBRARY NAMES NxExtensions - PATH_SUFFIXES "PhysX/v2.6.4" PATH_SUFFIXES "PhysX/v2.7.3" PATHS "${PHYSX_SDK_PATH}/lib/win32" )