mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Christopher NielsenandKen
ca9ffa681f
opencv: eliminate conflict with opencv4; add variants debug, nonfree, tests opencv4: eliminate conflict with opencv; switch to shared libs; rename variant opencv_contrib to contrib, to match opencv; add variants debug, java, python35..39, qt4, qt5, tbb, tests, vtk gerbil: update for opencv4 library move py-pytorch: update for opencv4 library move Fixes: https://trac.macports.org/ticket/61912 Fixes: https://trac.macports.org/ticket/61801 Fixes: https://trac.macports.org/ticket/60118 Fixes: https://trac.macports.org/ticket/58845 Fixes: https://trac.macports.org/ticket/57640 Fixes: https://trac.macports.org/ticket/51734 Fixes: https://trac.macports.org/ticket/48218 Fixes: https://trac.macports.org/ticket/32528
12 lines
662 B
Diff
12 lines
662 B
Diff
--- cmake/OpenCVUtils.cmake.orig 2018-02-23 01:38:33.000000000 -0700
|
|
+++ cmake/OpenCVUtils.cmake 2018-04-20 06:20:44.000000000 -0700
|
|
@@ -1335,7 +1335,7 @@
|
|
macro(ocv_get_libname var_name)
|
|
get_filename_component(__libname "${ARGN}" NAME)
|
|
# libopencv_core.so.3.3 -> opencv_core
|
|
- string(REGEX REPLACE "^lib(.+)\\.(a|so|dll)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
|
|
+ string(REGEX REPLACE "^lib(.+)\\.(a|so|dll|dylib)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
|
|
# MacOSX: libopencv_core.3.3.1.dylib -> opencv_core
|
|
string(REGEX REPLACE "^lib(.+[^.0-9])\\.([.0-9]+\\.)?dylib$" "\\1" __libname "${__libname}")
|
|
set(${var_name} "${__libname}")
|