Skip to content

O
opencv
Commit 88a7a8f5 authored by Andrey Morozov's avatar Andrey Morozov
Browse files
Options

fixed build npp for linux

parent 74c4b5a5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/gpu/FindNPP.cmake
View file @ 88a7a8f5
...@@ -47,7 +47,7 @@ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) ...@@ -47,7 +47,7 @@ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
else() else()
set(NPP_SUFFIX "-mt") set(NPP_SUFFIX "-mt")
endif() endif()
elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 4) else(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
if (UNIX OR APPLE) if (UNIX OR APPLE)
set(NPP_SUFFIX "64") set(NPP_SUFFIX "64")
else() else()
...@@ -67,13 +67,14 @@ mark_as_advanced(CUDA_NPP_INCLUDES) ...@@ -67,13 +67,14 @@ mark_as_advanced(CUDA_NPP_INCLUDES)
# Find NPP library # Find NPP library
find_library(CUDA_NPP_LIBRARIES find_library(CUDA_NPP_LIBRARIES
NAMES libnpp${NPP_SUFFIX} NAMES npp${NPP_SUFFIX} libnpp${NPP_SUFFIX}
PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}/common/lib" PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}/common/lib"
DOC "NPP library" DOC "NPP library"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
# Search default search paths, after we search our own set of paths. # Search default search paths, after we search our own set of paths.
find_library(CUDA_NPP_LIBRARIES NAMES libnpp${NPP_SUFFIX} DOC "NPP library") find_library(CUDA_NPP_LIBRARIES NAMES npp${NPP_SUFFIX} libnpp${NPP_SUFFIX} DOC "NPP library")
mark_as_advanced(CUDA_NPP_LIBRARIES) mark_as_advanced(CUDA_NPP_LIBRARIES)
if(NOT EXISTS ${CUDA_NPP_LIBRARIES} OR NOT EXISTS ${CUDA_NPP_INCLUDES}/npp.h) if(NOT EXISTS ${CUDA_NPP_LIBRARIES} OR NOT EXISTS ${CUDA_NPP_INCLUDES}/npp.h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment