mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

created build infrastructure for NPP linking in CMake.

Browse Source
This commit is contained in:
Andrey Morozov 2010-09-10 11:02:52 +00:00
parent 01eac6d3e3
commit bbc2015014
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
CMakeLists.txt
View File

@ -299,6 +299,10 @@ set(WITH_TBB OFF CACHE BOOL "Include TBB support")
set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2 support")
set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
if (WITH_CUDA)
set(WITH_NPP OFF CACHE BOOL "Include Nvidia NPP support")
endif()
if(WIN32)
set(WITH_VIDEOINPUT ON CACHE BOOL "Enable VideoInput support")
endif()
@ -673,6 +677,73 @@ if (WITH_CUDA)
endif()
endif()
############################### NPP ################################
if (WITH_NPP)
set(NPP_PATH "" CACHE PATH "Path to NPP folder")
if (NOT ${NPP_PATH} STREQUAL "")
set(NPP_DEFAULT_INCLUDE_DIRS ${NPP_PATH})
set(NPP_DEFAULT_INCLUDE_DIRS ${NPP_DEFAULT_INCLUDE_DIRS}common/npp/include/)
#message(STATUS "NPP DEFAULT INCLUDE DIRS: ${NPP_DEFAULT_INCLUDE_DIRS}")
find_path(NPP_INCLUDE_DIR "npp.h" PATHS NPP_DEFAULT_INCLUDE_DIRS DOC "The path to NPP headers")
#message(STATUS "npp: ${NPP_INCLUDE_DIR}")
if (NPP_INCLUDE_DIR)
#message(STATUS "PROC: ${CMAKE_SYSTEM_PROCESSOR}")
set(X86_64 0)
set(X86 0)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)
set(X86_64 1)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*)
set(X86_64 1)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)
set(X86 1)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)
set(X86 1)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*)
set(X86 1)
endif()
message (STATUS "x86 : ${X86}")
message (STATUS "x64 : ${X86_64}")
if (UNIX AND X86)
set(NPP_LIB npp32)
elseif(UNIX AND X86_64)
set(NPP_LIB npp64)
elseif(WIN32 AND x86)
set(NPP_LIB npp-mt)
elseif(WIN32 AND X86_64)
set(NPP_LIB npp-mt-x64)
elseif(APPLE AND x86)
set(NPP_LIB npp32.dynlib)
elseif(APPLE AND x86_64)
set(NPP_LIB npp64.dynlib)
endif()
set(NPP_LIB_DIR "${NPP_INCLUDE_DIR}/../../lib" CACHE PATH "Full path of NPP library directory")
link_directories("${NPP_LIB_DIR}")
else()
message(STATUS "Could NOT find npp.h")
endif()
if(NOT "${NPP_INCLUDE_DIR}" STREQUAL "")
include_directories("${NPP_INCLUDE_DIR}")
set(HAVE_NPP 1)
endif()
endif()
endif()
############################### VideoInput ################################
if (WIN32 AND WITH_VIDEOINPUT)

2
modules/gpu/CMakeLists.txt
View File

@ -99,7 +99,7 @@ set_target_properties(${the_target} PROPERTIES
)
# Add the required libraries for linking:
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} ${CUDA_LIBRARIES})
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} ${CUDA_LIBRARIES} ${NPP_LIB})
if(MSVC)
if(CMAKE_CROSSCOMPILING)