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

cmake: workaround CPATH ipp_iw issue

Browse Source 
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
This commit is contained in:
Alexander Alekhin 2018-03-26 17:24:37 +03:00
parent 8a0cc5009e
commit 87498bc6d4
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/ippicv/CMakeLists.txt vendored
View File

@ -4,7 +4,7 @@
# ----------------------------------------------------------------------------
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)
if(HAVE_IPP_ICV)
add_definitions(-DICV_BASE)

4
cmake/OpenCVFindLibsPerf.cmake
View File

@ -13,10 +13,10 @@ if(WITH_IPP)
if(HAVE_IPP)
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindIPPIW.cmake")
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})
endif()
ocv_include_directories(SYSTEM ${IPP_INCLUDE_DIRS})
ocv_include_directories(${IPP_INCLUDE_DIRS})
list(APPEND OPENCV_LINKER_LIBS ${IPP_LIBRARIES})
# Details: #10229

7
modules/core/include/opencv2/core/private.hpp
View File

@ -237,8 +237,15 @@ T* allocSingleton(size_t count) { return static_cast<T*>(fastMalloc(sizeof(T) *
#include "ipp.h"
#endif
#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_ll.h"
# if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
# pragma GCC diagnostic pop
# endif
#endif
#if IPP_VERSION_X100 >= 201700