Commit 0b33eb09 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by Alexander Alekhin

cmake: fix ocv_target_compile_definitions() for world builds

fixes CUDA build
parent 8ed1a274
......@@ -863,6 +863,11 @@ macro(_ocv_create_module)
ocv_target_link_libraries(${the_module} LINK_PRIVATE ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
endif()
if(OPENCV_MODULE_${the_module}_COMPILE_DEFINITIONS)
target_compile_definitions(${the_module} ${OPENCV_MODULE_${the_module}_COMPILE_DEFINITIONS})
unset(OPENCV_MODULE_${the_module}_COMPILE_DEFINITIONS CACHE)
endif()
add_dependencies(opencv_modules ${the_module})
if(ENABLE_SOLUTION_FOLDERS)
......
......@@ -987,7 +987,14 @@ endfunction()
function(ocv_target_compile_definitions target)
_ocv_fix_target(target)
target_compile_definitions(${target} ${ARGN})
if(NOT TARGET ${target})
if(NOT DEFINED OPENCV_MODULE_${target}_LOCATION)
message(FATAL_ERROR "ocv_target_compile_definitions: invalid target: '${target}'")
endif()
set(OPENCV_MODULE_${target}_COMPILE_DEFINITIONS ${OPENCV_MODULE_${target}_COMPILE_DEFINITIONS} ${ARGN} CACHE INTERNAL "" FORCE)
else()
target_compile_definitions(${target} ${ARGN})
endif()
endfunction()
......
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