21524f5149
* opencv: add new version, variant, and patch - added version 4.5.4 - added tesseract variant - added patch to not add system paths * Add leptonica depends and contrib conflicts * Add dependencies for 1394 support - new package: libraw1394 - add sdl dependency to libdc1394 - add conflict for openjpeg and jasper * Adjust dependencies and conflicts for opencv modules * rewrite of opencv - all prebuilt apps are now variants and can be installed - core is no longer a variant. It was always built anyway so it was not really a variant. - contrib is no longer a variant. All of the contrib modules are now available as variants. - components that can not be built with Spack are no longer variants. They are set to 'off' to prevent pulling from system. - handle the case where a module and a component have the same name - use `with when` framework - adjust dependencies and conflicts - new package: libraw1394 - have libdc1394 depend on libraw1394 - patch to find clp - patch to find onnx - patch for cvv to find Qt - format with black * Incorporate recommended changes - fix variants and dependencies on packages that depend on opencv - remove opencv-3.2 and patches - add some new patches to handle different versions - cntk needs further work - the openvslam package was markde deprecated as it is no longer an active project and the repository has no code * Remove gmake dependency. * Remove sdl support SDL is only used in an example case, but the examples are not built. * remove openvslam * Remove opencv+flann variant from 3dtk * Back out cfitsio constraint from py-astropy * remove opencv+flann variant from dlib * remove boost constraint from 3dtk * Remove non-opencv related bohrium changes * Adjustments for cntk - protobuf constraint at version 3.10 - need specific variants for opencv - improve patch * Deprecate CNTK package * variant tweaks - added appropriate conflicts for cublas - made cuda/cudev relationship explicit - moved openx to pending components as it needs an openvx package * fix isort style error * Use date version from kaldi rather than commit * Revert changes from a bad rebase * Add +flann to 3dtk and dlib * Use compression support with libtiff * remove `+datasets` from opencv dependency The py-torchgeo package does not need opencv+datasets. * fix typo zip --> zlib
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
diff -ru a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2021-10-09 10:48:26.000000000 -0500
|
|
+++ b/CMakeLists.txt 2021-11-11 17:29:04.189734621 -0600
|
|
@@ -161,34 +161,6 @@
|
|
include(cmake/OpenCVDetectCXXCompiler.cmake)
|
|
ocv_cmake_hook(POST_DETECT_COMPILER)
|
|
|
|
-# Add these standard paths to the search paths for FIND_LIBRARY
|
|
-# to find libraries from these locations first
|
|
-if(UNIX AND NOT ANDROID)
|
|
- if(X86_64 OR CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
- if(EXISTS /lib64)
|
|
- list(APPEND CMAKE_LIBRARY_PATH /lib64)
|
|
- else()
|
|
- list(APPEND CMAKE_LIBRARY_PATH /lib)
|
|
- endif()
|
|
- if(EXISTS /usr/lib64)
|
|
- list(APPEND CMAKE_LIBRARY_PATH /usr/lib64)
|
|
- else()
|
|
- list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
|
|
- endif()
|
|
- elseif(X86 OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
- if(EXISTS /lib32)
|
|
- list(APPEND CMAKE_LIBRARY_PATH /lib32)
|
|
- else()
|
|
- list(APPEND CMAKE_LIBRARY_PATH /lib)
|
|
- endif()
|
|
- if(EXISTS /usr/lib32)
|
|
- list(APPEND CMAKE_LIBRARY_PATH /usr/lib32)
|
|
- else()
|
|
- list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
|
|
- endif()
|
|
- endif()
|
|
-endif()
|
|
-
|
|
# Add these standard paths to the search paths for FIND_PATH
|
|
# to find include files from these locations first
|
|
if(MINGW)
|