Cleanup

opengisch · Dec 9, 2024 · e431481 · e431481
1 parent 9a29bf7
commit e431481
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -133,10 +133,6 @@ jobs:
 
           echo "artifact_name=${ARTIFACT_NAME}" >> "$GITHUB_OUTPUT"
 
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: always()
-
       - name: 📑 Upload logs
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,10 +187,6 @@ if (ENABLE_TESTS)
   add_subdirectory(test)
 endif()
 
-set(CMAKE_FIND_DEBUG_MODE TRUE)
-find_package(FFMPEG COMPONENTS avcodec avdevice avformat swresample swscale REQUIRED)
-set(CMAKE_FIND_DEBUG_MODE FALSE)
-
 if(WITH_VCPKG)
   # Copy files from the install dir to where it
   # will be bundled

diff --git a/cmake/qgis-cmake-wrapper.cmake b/cmake/qgis-cmake-wrapper.cmake
@@ -141,23 +141,6 @@ if(TRUE) # Should possibly have a "static only" check
   target_link_libraries(QGIS::Core INTERFACE PkgConfig::freexl)
   _qgis_core_add_dependency(Qt6Keychain::Qt6Keychain Qt6Keychain)
 
-  find_package(FFMPEG REQUIRED)
-  find_library(AVCODEC_LIBRARY avcodec)
-  find_library(AVDEVICE_LIBRARY avdevice)
-  find_library(AVFORMAT_LIBRARY avformat)
-  find_library(SWRESAMPLE_LIBRARY swresample)
-  find_library(SWSCALE_LIBRARY swscale)
-  message(STATUS "FFMPEG library paths:")
-  message(STATUS ${AVCODEC_LIBRARY})
-  message(STATUS ${AVDEVICE_LIBRARY})
-  message(STATUS ${AVFORMAT_LIBRARY})
-  message(STATUS ${SWRESAMPLE_LIBRARY})
-  message(STATUS ${SWSCALE_LIBRARY})
-  target_link_libraries(QGIS::Core INTERFACE ${AVCODEC_LIBRARY})
-  target_link_libraries(QGIS::Core INTERFACE ${AVDEVICE_LIBRARY})
-  target_link_libraries(QGIS::Core INTERFACE ${AVFORMAT_LIBRARY})
-  target_link_libraries(QGIS::Core INTERFACE ${SWRESAMPLE_LIBRARY})
-  target_link_libraries(QGIS::Core INTERFACE ${SWSCALE_LIBRARY})
 
   find_package(Qt6 COMPONENTS Core Gui Network Xml Svg Concurrent Sql Positioning Core5Compat Multimedia)
   target_link_libraries(QGIS::Core INTERFACE

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -398,6 +398,26 @@ if(TARGET Qt::PrintSupport)
   target_link_libraries(qfield_core PUBLIC Qt::PrintSupport)
 endif()
 
+if(MSVC)
+  find_package(FFMPEG REQUIRED)
+  find_library(AVCODEC_LIBRARY avcodec)
+  find_library(AVDEVICE_LIBRARY avdevice)
+  find_library(AVFORMAT_LIBRARY avformat)
+  find_library(AVUTIL_LIBRARY avutil)
+  find_library(SWRESAMPLE_LIBRARY swresample)
+  find_library(SWSCALE_LIBRARY swscale)
+  find_library(OPENH264_LIBRARY openh264)
+  target_link_libraries(
+    qfield_core
+    PUBLIC ${AVCODEC_LIBRARY}
+           ${AVDEVICE_LIBRARY}
+           ${AVFORMAT_LIBRARY}
+           ${AVUTIL_LIBRARY}
+           ${SWRESAMPLE_LIBRARY}
+           ${SWSCALE_LIBRARY}
+           ${OPENH264_LIBRARY})
+endif()
+
 install(FILES ${QFIELD_CORE_HDRS} DESTINATION ${QFIELD_INCLUDE_DIR})
 install(
   TARGETS qfield_core