diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index f6cfddc2a2..b275235cbe 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -299,12 +299,6 @@ macro(ocv_glob_modules) if(m MATCHES "^opencv_") string(REGEX REPLACE "^opencv_" "" __shortname "${m}") add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/${__shortname}") - - #workaround for link_directories inheritance - get_directory_property(__lnkfix DIRECTORY "${OPENCV_MODULE_${m}_LOCATION}" LINK_DIRECTORIES) - if(__lnkfix) - link_directories(${__lnkfix}) - endif() endif() endforeach() unset(__shortname) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 1452806f20..a8d70c0cdb 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -244,18 +244,11 @@ if(IOS) set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} bz2 "-framework QuartzCore" "-framework CoreFoundation" "-framework ImageIO" "-framework CoreGraphics" "-framework AVFoundation") endif() -if(OPENCV_BUILD_3RDPARTY_LIBS AND WIN32) - link_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/lib") -endif() - source_group("Src" FILES ${highgui_srcs} ${highgui_hdrs}) source_group("Include" FILES ${highgui_ext_hdrs}) ocv_set_module_sources(HEADERS ${highgui_ext_hdrs} SOURCES ${highgui_srcs} ${highgui_hdrs} ${grfmt_srcs} ${grfmt_hdrs}) ocv_module_include_directories() -if(WIN32) - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") -endif() ocv_create_module(${GRFMT_LIBS} ${HIGHGUI_LIBRARIES}) @@ -264,9 +257,12 @@ if(BUILD_SHARED_LIBS) endif() if(MSVC) - set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG") + set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG") endif() +#stop automatic dependencies propagation for this module +set_target_properties(${the_module} PROPERTIES LINK_INTERFACE_LIBRARIES "") + ocv_add_precompiled_headers(${the_module}) ocv_add_accuracy_tests()