Commit 87498bc6 authored by Alexander Alekhin's avatar Alexander Alekhin

cmake: workaround CPATH ipp_iw issue

CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
parent 8a0cc500
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
project(${IPP_IW_LIBRARY}) project(${IPP_IW_LIBRARY})
ocv_include_directories(SYSTEM ${IPP_INCLUDE_DIRS} ${IPP_IW_PATH}/include) ocv_include_directories(${IPP_INCLUDE_DIRS} ${IPP_IW_PATH}/include)
add_definitions(-DIW_BUILD) add_definitions(-DIW_BUILD)
if(HAVE_IPP_ICV) if(HAVE_IPP_ICV)
add_definitions(-DICV_BASE) add_definitions(-DICV_BASE)
......
...@@ -13,10 +13,10 @@ if(WITH_IPP) ...@@ -13,10 +13,10 @@ if(WITH_IPP)
if(HAVE_IPP) if(HAVE_IPP)
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindIPPIW.cmake") include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindIPPIW.cmake")
if(HAVE_IPP_IW) if(HAVE_IPP_IW)
ocv_include_directories(SYSTEM ${IPP_IW_INCLUDES}) ocv_include_directories(${IPP_IW_INCLUDES})
list(APPEND OPENCV_LINKER_LIBS ${IPP_IW_LIBRARIES}) list(APPEND OPENCV_LINKER_LIBS ${IPP_IW_LIBRARIES})
endif() endif()
ocv_include_directories(SYSTEM ${IPP_INCLUDE_DIRS}) ocv_include_directories(${IPP_INCLUDE_DIRS})
list(APPEND OPENCV_LINKER_LIBS ${IPP_LIBRARIES}) list(APPEND OPENCV_LINKER_LIBS ${IPP_LIBRARIES})
# Details: #10229 # Details: #10229
......
...@@ -237,8 +237,15 @@ T* allocSingleton(size_t count) { return static_cast<T*>(fastMalloc(sizeof(T) * ...@@ -237,8 +237,15 @@ T* allocSingleton(size_t count) { return static_cast<T*>(fastMalloc(sizeof(T) *
#include "ipp.h" #include "ipp.h"
#endif #endif
#ifdef HAVE_IPP_IW #ifdef HAVE_IPP_IW
# if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wsuggest-override"
# endif
#include "iw++/iw.hpp" #include "iw++/iw.hpp"
#include "iw/iw_ll.h" #include "iw/iw_ll.h"
# if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
# pragma GCC diagnostic pop
# endif
#endif #endif
#if IPP_VERSION_X100 >= 201700 #if IPP_VERSION_X100 >= 201700
......
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