From: berak Date: Fri, 22 Mar 2013 08:31:40 +0000 (+0100) Subject: Update CMakeLists.txt X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1119^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d32af86e75e5391b815cf32f27a546a715a416a6;p=profile%2Fivi%2Fopencv.git Update CMakeLists.txt exclude IlmImf/b44ExpLogTable.cpp from the build, it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation when included with static linking it introduces a problem with multiple definitions of main() --- diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt index a77a6e1..3d4cc68 100644 --- a/3rdparty/openexr/CMakeLists.txt +++ b/3rdparty/openexr/CMakeLists.txt @@ -28,6 +28,8 @@ file(GLOB lib_srcs Half/half.cpp Iex/*.cpp IlmThread/*.cpp Imath/*.cpp IlmImf/*. file(GLOB lib_hdrs Half/*.h Iex/Iex*.h IlmThread/IlmThread*.h Imath/Imath*.h IlmImf/*.h) list(APPEND lib_hdrs "${CMAKE_CURRENT_BINARY_DIR}/IlmBaseConfig.h" "${CMAKE_CURRENT_BINARY_DIR}/OpenEXRConfig.h") +ocv_list_filterout(lib_srcs IlmImf/b44ExpLogTable.cpp) + if(WIN32) ocv_list_filterout(lib_srcs Posix.*cpp) else()