generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.

Browse Source 
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
This commit is contained in:
Roman Donchenko
2013-08-22 18:04:50 +04:00
parent 797beef383
commit 6fed0e85c2
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
set(the_description "The Core Functionality")
ocv_add_module(core ${ZLIB_LIBRARIES} OPTIONAL opencv_cudev)
ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
ocv_module_include_directories(${ZLIB_INCLUDE_DIRS})
if (HAVE_WINRT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW /GS /Gm- /AI\"${WINDOWS_SDK_PATH}/References/CommonConfiguration/Neutral\" /AI\"${VISUAL_STUDIO_PATH}/vcpackages\"")