diff --git a/cmake_modules/FindFlyCapture2.cmake b/cmake_modules/FindFlyCapture2.cmake index 0e070c59..0bbe8430 100644 --- a/cmake_modules/FindFlyCapture2.cmake +++ b/cmake_modules/FindFlyCapture2.cmake @@ -6,15 +6,27 @@ # FlyCapture2_INCLUDE_DIRS - The FlyCapture2 include directory. # FlyCapture2_LIBRARIES - The FlyCapture2 library to link against. +if(CMAKE_CL_64) +set(FlyCapture2_LIBDIR $ENV{FlyCapture2_ROOT_DIR}/lib64) +else() +set(FlyCapture2_LIBDIR $ENV{FlyCapture2_ROOT_DIR}/lib) +endif() + +if(CMAKE_CL_64) +set(Triclops_LIBDIR $ENV{Triclops_ROOT_DIR}/lib64) +else() +set(Triclops_LIBDIR $ENV{Triclops_ROOT_DIR}/lib) +endif() + #FlyCapture2 SDK find_path(FlyCapture2_INCLUDE_DIR NAMES FlyCapture2.h PATHS $ENV{FlyCapture2_ROOT_DIR}/include) -find_library(FlyCapture2_LIBRARY NAMES FlyCapture2_v100 FlyCapture2 flycapture2 PATHS $ENV{FlyCapture2_ROOT_DIR}/lib64 $ENV{FlyCapture2_ROOT_DIR}/lib) +find_library(FlyCapture2_LIBRARY NAMES FlyCapture2_v100 FlyCapture2 flycapture2 NO_DEFAULT_PATH PATHS ${FlyCapture2_LIBDIR}) # Triclops SDK find_path(Triclops_INCLUDE_DIR NAMES triclops.h PATHS $ENV{Triclops_ROOT_DIR}/include) -find_library(Triclops_LIBRARY NAMES triclops triclops_v100 PATHS $ENV{Triclops_ROOT_DIR}/lib64 $ENV{Triclops_ROOT_DIR}/lib) -find_library(FlyCaptureBridge_LIBRARY NAMES flycapture2bridge flycapture2bridge_v100 PATHS $ENV{Triclops_ROOT_DIR}/lib64 $ENV{Triclops_ROOT_DIR}/lib) -find_library(pnmutils_LIBRARY NAMES pnmutils pnmutils_v100 PATHS $ENV{Triclops_ROOT_DIR}/lib64 $ENV{Triclops_ROOT_DIR}/lib) +find_library(Triclops_LIBRARY NAMES triclops triclops_v100 NO_DEFAULT_PATH PATHS ${Triclops_LIBDIR}) +find_library(FlyCaptureBridge_LIBRARY NAMES flycapture2bridge flycapture2bridge_v100 NO_DEFAULT_PATH PATHS ${Triclops_LIBDIR}) +find_library(pnmutils_LIBRARY NAMES pnmutils pnmutils_v100 NO_DEFAULT_PATH PATHS ${Triclops_LIBDIR}) IF (FlyCapture2_INCLUDE_DIR AND Triclops_INCLUDE_DIR AND FlyCapture2_LIBRARY AND Triclops_LIBRARY AND FlyCaptureBridge_LIBRARY AND pnmutils_LIBRARY) SET(FlyCapture2_FOUND TRUE) @@ -22,6 +34,9 @@ IF (FlyCapture2_INCLUDE_DIR AND Triclops_INCLUDE_DIR AND FlyCapture2_LIBRARY AND SET(FlyCapture2_LIBRARIES ${FlyCapture2_LIBRARY} ${Triclops_LIBRARY} ${FlyCaptureBridge_LIBRARY} ${pnmutils_LIBRARY}) ENDIF (FlyCapture2_INCLUDE_DIR AND Triclops_INCLUDE_DIR AND FlyCapture2_LIBRARY AND Triclops_LIBRARY AND FlyCaptureBridge_LIBRARY AND pnmutils_LIBRARY) +MESSAGE(STATUS "FlyCapture2_INCLUDE_DIRS={FlyCapture2_INCLUDE_DIRS}") +MESSAGE(STATUS "FlyCapture2_LIBRARIES={FlyCapture2_LIBRARIES}") + IF (FlyCapture2_FOUND) # show which FlyCapture2 was found only if not quiet IF (NOT FlyCapture2_FIND_QUIETLY)