diff --git a/sdk/plugins/ct8.cmake b/sdk/plugins/ct8.cmake index c06b98b..4a5634e 100644 --- a/sdk/plugins/ct8.cmake +++ b/sdk/plugins/ct8.cmake @@ -3,7 +3,10 @@ set(BR_WITH_CT8 OFF CACHE BOOL "Build with Cognitec FaceVACS 8") if(${BR_WITH_CT8}) find_package(CT8 REQUIRED) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/ct8.cpp ${CT8_RESOURCES}) + + set(CT8_LIBS optimized ${CT8_LIBRARY_RELEASE} debug ${CT8_LIBRARY_DEBUG}) set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${CT8_LIBS}) + install(FILES ${CT8_DIR_LIB}/libfrsdk-8.5.0.so ${CT8_DIR_LIB}/../share/libhasp_linux_x86_64_67109.so ${CT8_DIR_LIB}/../share/libiomp5.so diff --git a/share/openbr/cmake/FindCT8.cmake b/share/openbr/cmake/FindCT8.cmake index 8fc852b..2b52560 100644 --- a/share/openbr/cmake/FindCT8.cmake +++ b/share/openbr/cmake/FindCT8.cmake @@ -10,20 +10,28 @@ set(CT8_DIR "CT8_DIR-NOTFOUND" CACHE PATH "Cognitec FaceVACS 8.x directory") -if(CMAKE_HOST_APPLE) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_64/gcc-4.2-ipp) - else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_32/gcc-4.2-ipp) - endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + +if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(ARCH_STRING x86_64) +else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(ARCH_STRING x86_32) +endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + +if(DEFINED MSVC80) + set(COMP_DIR_EXT "msc_8.0-ipp_crtdll") +elseif(DEFINED MSVC90) + set(COMP_DIR_EXT "msc_9.0-ipp_crtdll") +elseif(DEFINED MSVC10) + set(COMP_DIR_EXT "msc_10.0-ipp_crtdll") +elseif(CMAKE_HOST_APPLE) + set(COMP_DIR_EXT "gcc-4.2-ipp") else() - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_64/gcc-4.3-ipp) - else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_32/gcc-4.3-ipp) - endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(COMP_DIR_EXT "gcc-4.3-ipp") endif() -set(CT8_LIBS frsdk-8.5.0) +set(CT8_DIR_LIB ${CT8_DIR}/lib/${ARCH_STRING}/${COMP_DIR_EXT} ) +set(CT8_LIBRARY_RELEASE libfrsdk-8.6.0) +set(CT8_LIBRARY_DEBUG libfrsdk-8.6.0d) + include_directories(${CT8_DIR}/include) -link_directories(${CT8_DIR_LIB}) +link_directories(${CT8_DIR_LIB} ${CT8_DIR_LIB}_g)