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
11a726ce
Commit
11a726ce
authored
Jul 03, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9057 from alalek:static_build_workaround
parents
c3586b85
c5a68468
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
0 deletions
+20
-0
CMakeLists.txt
modules/viz/CMakeLists.txt
+20
-0
No files found.
modules/viz/CMakeLists.txt
View file @
11a726ce
...
@@ -4,6 +4,26 @@ endif()
...
@@ -4,6 +4,26 @@ endif()
set
(
the_description
"Viz"
)
set
(
the_description
"Viz"
)
include
(
${
VTK_USE_FILE
}
)
include
(
${
VTK_USE_FILE
}
)
if
(
NOT BUILD_SHARED_LIBS
)
# We observed conflict between builtin 3rdparty libraries and
# system-wide similar libraries (but with different versions) from VTK dependencies
set
(
_conflicts
""
)
foreach
(
dep
${
VTK_LIBRARIES
}
)
if
((
"
${
dep
}
"
MATCHES
"libz
\\
."
AND BUILD_ZLIB
)
OR
(
"
${
dep
}
"
MATCHES
"libjpeg
\\
."
AND BUILD_JPEG
)
OR
(
"
${
dep
}
"
MATCHES
"libpng
\\
."
AND BUILD_PNG
)
OR
(
"
${
dep
}
"
MATCHES
"libtiff
\\
."
AND BUILD_TIFF
)
)
list
(
APPEND _conflicts
"
${
dep
}
"
)
endif
()
endforeach
()
if
(
_conflicts
)
message
(
STATUS
"Disabling VIZ module due conflicts with VTK dependencies:
${
_conflicts
}
"
)
ocv_module_disable
(
viz
)
endif
()
endif
()
ocv_define_module
(
viz opencv_core WRAP python
)
ocv_define_module
(
viz opencv_core WRAP python
)
ocv_target_link_libraries
(
${
the_module
}
${
VTK_LIBRARIES
}
)
ocv_target_link_libraries
(
${
the_module
}
${
VTK_LIBRARIES
}
)
...
...
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