Peter M. Groen / openbr

Commit e035e21e621c6981f46e1fabc0890f1561327d85

Authored by caotto
1 parent 670ffb11

Update ct8 cmake files 

Target version 8.6.0 of the sdk (this could stand to be generalized somehow)
Link debug versions of the library when building debug configurations.
When building with visual studio, pick the appropriate pre-complied library
for the version of the compiler being used.
Inline Side-by-side
Showing 2 changed files with 24 additions and 13 deletions
sdk/plugins/ct8.cmake
  View file @e035e21
@@ -3,7 +3,10 @@ set(BR_WITH_CT8 OFF CACHE BOOL "Build with Cognitec FaceVACS 8") @@ -3,7 +3,10 @@ set(BR_WITH_CT8 OFF CACHE BOOL "Build with Cognitec FaceVACS 8")
3 if(${BR_WITH_CT8}) 3 if(${BR_WITH_CT8})
4 find_package(CT8 REQUIRED) 4 find_package(CT8 REQUIRED)
5 set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/ct8.cpp ${CT8_RESOURCES}) 5 set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/ct8.cpp ${CT8_RESOURCES})
  6 +
  7 + set(CT8_LIBS optimized ${CT8_LIBRARY_RELEASE} debug ${CT8_LIBRARY_DEBUG})
6 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${CT8_LIBS}) 8 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${CT8_LIBS})
  9 +
7 install(FILES ${CT8_DIR_LIB}/libfrsdk-8.5.0.so 10 install(FILES ${CT8_DIR_LIB}/libfrsdk-8.5.0.so
8 ${CT8_DIR_LIB}/../share/libhasp_linux_x86_64_67109.so 11 ${CT8_DIR_LIB}/../share/libhasp_linux_x86_64_67109.so
9 ${CT8_DIR_LIB}/../share/libiomp5.so 12 ${CT8_DIR_LIB}/../share/libiomp5.so
share/openbr/cmake/FindCT8.cmake
  View file @e035e21
@@ -10,20 +10,28 @@ @@ -10,20 +10,28 @@
10 10
11 set(CT8_DIR "CT8_DIR-NOTFOUND" CACHE PATH "Cognitec FaceVACS 8.x directory") 11 set(CT8_DIR "CT8_DIR-NOTFOUND" CACHE PATH "Cognitec FaceVACS 8.x directory")
12 12
13 -if(CMAKE_HOST_APPLE)  
14 - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")  
15 - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_64/gcc-4.2-ipp)  
16 - else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")  
17 - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_32/gcc-4.2-ipp)  
18 - endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 13 +
  14 +if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
  15 + set(ARCH_STRING x86_64)
  16 +else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
  17 + set(ARCH_STRING x86_32)
  18 +endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
  19 +
  20 +if(DEFINED MSVC80)
  21 + set(COMP_DIR_EXT "msc_8.0-ipp_crtdll")
  22 +elseif(DEFINED MSVC90)
  23 + set(COMP_DIR_EXT "msc_9.0-ipp_crtdll")
  24 +elseif(DEFINED MSVC10)
  25 + set(COMP_DIR_EXT "msc_10.0-ipp_crtdll")
  26 +elseif(CMAKE_HOST_APPLE)
  27 + set(COMP_DIR_EXT "gcc-4.2-ipp")
19 else() 28 else()
20 - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")  
21 - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_64/gcc-4.3-ipp)  
22 - else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")  
23 - set(CT8_DIR_LIB ${CT8_DIR}/lib/x86_32/gcc-4.3-ipp)  
24 - endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 29 + set(COMP_DIR_EXT "gcc-4.3-ipp")
25 endif() 30 endif()
26 31
27 -set(CT8_LIBS frsdk-8.5.0) 32 +set(CT8_DIR_LIB ${CT8_DIR}/lib/${ARCH_STRING}/${COMP_DIR_EXT} )
  33 +set(CT8_LIBRARY_RELEASE libfrsdk-8.6.0)
  34 +set(CT8_LIBRARY_DEBUG libfrsdk-8.6.0d)
  35 +
28 include_directories(${CT8_DIR}/include) 36 include_directories(${CT8_DIR}/include)
29 -link_directories(${CT8_DIR_LIB}) 37 +link_directories(${CT8_DIR_LIB} ${CT8_DIR_LIB}_g)