Merge pull request #16 from rainyl/rm-sys-path-ffmpeg-search

exclude system paths from ffmpeg search path
rainyl · Nov 21, 2024 · 3da844d · 3da844d
2 parents 69691f6 + 07f71d1
commit 3da844d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
@@ -36,11 +36,13 @@ jobs:
         -DCMAKE_BUILD_TYPE=Release \
         -DOPENCV_EXTRA_MODULES_PATH="${{ github.workspace }}/opencv_contrib/modules" \
         -DBUILD_TIFF=OFF \
+        -DWITH_TIFF=OFF \
         -DBUILD_OPENJPEG=OFF \
+        -DWITH_OPENJPEG=OFF \
         -DWITH_OPENCL=OFF \
         -DWITH_OPENCL_SVM=OFF \
-        -DWITH_OPENCLAMDBLAS=ON \
-        -DWITH_OPENCLAMDFFT=ON \
+        -DWITH_OPENCLAMDBLAS=OFF \
+        -DWITH_OPENCLAMDFFT=OFF \
         -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
     steps:
       - uses: actions/checkout@v4
@@ -114,6 +116,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=Release \
         -DOPENCV_EXTRA_MODULES_PATH="${{ github.workspace }}/opencv_contrib/modules" \
         -DBUILD_TIFF=OFF \
+        -DWITH_TIFF=OFF \
         -DBUILD_OPENJPEG=OFF \
         -DWITH_OPENCL=OFF \
         -DWITH_OPENCL_SVM=OFF \

diff --git a/cmake/ffmpeg-config.cmake b/cmake/ffmpeg-config.cmake
@@ -203,15 +203,6 @@ macro(ffmpeg_find_component component)
             HINTS ${PC_FFMPEG_${component}_INCLUDE_DIRS}
             PATHS
             "${FFMPEG_ROOT}/include"
-            ~/Library/Frameworks
-            /Library/Frameworks
-            /usr/local/include
-            /usr/include
-            /sw/include # Fink
-            /opt/local/include # DarwinPorts
-            /opt/csw/include # Blastwave
-            /opt/include
-            /usr/freeware/include
             DOC "FFMPEG component ${component_name} include directory"
     )
 
@@ -241,17 +232,6 @@ macro(ffmpeg_find_component component)
                 PATHS
                 "${FFMPEG_ROOT}/lib"
                 "${FFMPEG_ROOT}/lib/${FFMPEG_ARCH}"
-                ~/Library/Frameworks
-                /Library/Frameworks
-                /usr/local/lib
-                /usr/local/lib64
-                /usr/lib
-                /usr/lib64
-                /sw/lib
-                /opt/local/lib
-                /opt/csw/lib
-                /opt/lib
-                /usr/freeware/lib64
                 "${FFMPEG_ROOT}/bin"
                 "${FFMPEG_ROOT}/bin/${FFMPEG_ARCH}"
                 DOC "FFMPEG component ${component_name} location"

diff --git a/cmake/ios.toolchain.cmake b/cmake/ios.toolchain.cmake
@@ -153,7 +153,7 @@
 #   command.
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 # CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds.
 # NOTE: To improve single-library build-times, provide the flag "OS_SINGLE_BUILD" as a build argument.