Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
2e4d7710
Commit
2e4d7710
authored
Apr 19, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fix PDB handling
parent
4f764b81
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
10 deletions
+17
-10
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+17
-10
No files found.
cmake/OpenCVUtils.cmake
View file @
2e4d7710
if
(
COMMAND ocv_cmake_dump_vars
)
# include guard
return
()
endif
()
include
(
CMakeParseArguments
)
# Debugging function
...
...
@@ -1111,15 +1115,6 @@ function(ocv_convert_to_lib_name var)
set
(
${
var
}
${
tmp
}
PARENT_SCOPE
)
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
function
(
ocv_install_target
)
...
...
@@ -1152,6 +1147,18 @@ function(ocv_install_target)
if
(
MSVC
)
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
AND NOT OPENCV_
${
__target
}
_PDB_SKIP
)
...
...
@@ -1196,7 +1203,7 @@ function(ocv_install_target)
endif
()
# 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
}
"
COMPONENT
${
__pdb_install_component
}
OPTIONAL
${
__pdb_exclude_from_all
}
)
else
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment