mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14366 from alalek:win32_fix_pdb

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-19 12:42:16 +00:00
commit 3abae3c511
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmake/OpenCVUtils.cmake
View File

@ -1,3 +1,7 @@
if(COMMAND ocv_cmake_dump_vars) # include guard
return()
endif()
include(CMakeParseArguments) include(CMakeParseArguments)
# Debugging function # Debugging function
@ -1111,15 +1115,6 @@ function(ocv_convert_to_lib_name var)
set(${var} ${tmp} PARENT_SCOPE) set(${var} ${tmp} PARENT_SCOPE)
endfunction() endfunction()
if(MSVC AND BUILD_SHARED_LIBS) # no defaults for static libs (modern CMake is required)
if(NOT CMAKE_VERSION VERSION_LESS 3.6.0)
option(INSTALL_PDB_COMPONENT_EXCLUDE_FROM_ALL "Don't install PDB files by default" ON)
option(INSTALL_PDB "Add install PDB rules" ON)
elseif(NOT CMAKE_VERSION VERSION_LESS 3.1.0)
option(INSTALL_PDB_COMPONENT_EXCLUDE_FROM_ALL "Don't install PDB files by default (not supported)" OFF)
option(INSTALL_PDB "Add install PDB rules" OFF)
endif()
endif()
# add install command # add install command
function(ocv_install_target) function(ocv_install_target)
@ -1152,6 +1147,18 @@ function(ocv_install_target)
if(MSVC) if(MSVC)
set(__target "${ARGV0}") set(__target "${ARGV0}")
# don't move this into global scope of this file: compiler settings (like MSVC variable) are not available during processing
if(BUILD_SHARED_LIBS) # no defaults for static libs (modern CMake is required)
if(NOT CMAKE_VERSION VERSION_LESS 3.6.0)
option(INSTALL_PDB_COMPONENT_EXCLUDE_FROM_ALL "Don't install PDB files by default" ON)
option(INSTALL_PDB "Add install PDB rules" ON)
elseif(NOT CMAKE_VERSION VERSION_LESS 3.1.0)
option(INSTALL_PDB_COMPONENT_EXCLUDE_FROM_ALL "Don't install PDB files by default (not supported)" OFF)
option(INSTALL_PDB "Add install PDB rules" OFF)
endif()
endif()
if(INSTALL_PDB AND NOT INSTALL_IGNORE_PDB if(INSTALL_PDB AND NOT INSTALL_IGNORE_PDB
AND NOT OPENCV_${__target}_PDB_SKIP AND NOT OPENCV_${__target}_PDB_SKIP
) )
@ -1196,7 +1203,7 @@ function(ocv_install_target)
endif() endif()
# message(STATUS "Adding PDB file installation rule: target=${__target} dst=${__dst} component=${__pdb_install_component}") # message(STATUS "Adding PDB file installation rule: target=${__target} dst=${__dst} component=${__pdb_install_component}")
if("${__target_type}" STREQUAL "SHARED_LIBRARY") if("${__target_type}" STREQUAL "SHARED_LIBRARY" OR "${__target_type}" STREQUAL "MODULE_LIBRARY")
install(FILES "$<TARGET_PDB_FILE:${__target}>" DESTINATION "${__dst}" install(FILES "$<TARGET_PDB_FILE:${__target}>" DESTINATION "${__dst}"
COMPONENT ${__pdb_install_component} OPTIONAL ${__pdb_exclude_from_all}) COMPONENT ${__pdb_install_component} OPTIONAL ${__pdb_exclude_from_all})
else() else()