Another bunch of MSVC related fixes and improvements (#1199)

* Make sure dirent is available on MSVC

It is a header only library with a single header (dirent.h). vcpkg installs this header with a custom logic to the global include path. However in other environments without modification upstream has to be treated like a usual library n cmake. "Linking" against the interface makes sure, that it is found and that the include paths are available for us. To conver both scenarios we use a FindDirent.cmake

* Don't require Kwalify for tests on MSVC

Kwalify is used to validate MLT's YAML files, but it is not available for MSVC easily (eg. via vcpkg). This is only relevant for local setups, because for CI it is covered by other plattforms and the results of YAML validation are plattform independent

* Add missing direct.h include for getcwd on MSVC

* Add fftw3 dependency to vcpkg build

* Fix spelling and duplicated entry in CMake preset

* Enable build of tests on MSVC CI

* Add optional libexif dep to vcpkg

Author: jlskuz

.github/workflows/build-windows-msvc.yml

@@ -50,3 +50,7 @@ jobs:
       - name: Install MLT
         run: |
           cmake --install build
+
+      - name: Run tests
+        run: |
+          ctest --test-dir build -C Debug

CMakeLists.txt

@@ -190,6 +190,7 @@ endif()
 
 if (MSVC)
   find_package(PThreads4W REQUIRED)
+  find_package(Dirent 1.26 REQUIRED)
 endif ()
 find_package(Threads REQUIRED)
 find_package(PkgConfig REQUIRED)
@@ -335,7 +336,10 @@ endif()
 
 if(BUILD_TESTING)
   find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Test)
-  find_package(Kwalify REQUIRED)
+  if(NOT MSVC)
+    # Kwalify is not available for MSVC easily (eg. via vcpkg)
+    find_package(Kwalify REQUIRED)
+  endif()
   enable_testing()
 endif()
 

CMakePresets.json

@@ -8,7 +8,7 @@
             "binaryDir": "${sourceDir}/build",
             "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
             "cacheVariables": {
-                "BUILD_TESTING": "OFF",
+                "BUILD_TESTING": "ON",
                 "SWIG_PYTHON": "OFF",
                 "MOD_AVFORMAT": "ON",
                 "MOD_DECKLINK": "OFF",
@@ -32,7 +32,7 @@
                 "MOD_RTAUDIO": "OFF",
                 "MOD_RUBBERBAND": "ON",
                 "MOD_SDL2": "ON",
-                "MOD_DOX": "OFF",
+                "MOD_SPATIALAUDIO": "OFF",
                 "MOD_VIDSTAB": "OFF",
                 "MOD_VORBIS": "ON",
                 "MOD_XINE": "OFF",

cmake/FindDirent.cmake

@@ -0,0 +1,21 @@
+find_package(Dirent CONFIG)
+
+if(NOT Dirent_FOUND)
+    include(FindPackageHandleStandardArgs)
+
+    find_path(Dirent_INCLUDE_DIR
+        NAMES dirent.h
+    )
+
+    find_package_handle_standard_args(Dirent
+        REQUIRED_VARS
+            Dirent_INCLUDE_DIR
+    )
+
+    if(Dirent_FOUND AND NOT TARGET dirent)
+        add_library(dirent INTERFACE)
+        set_target_properties(dirent PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${Dirent_INCLUDE_DIR}"
+        )
+    endif()
+endif()

src/framework/CMakeLists.txt

@@ -87,7 +87,7 @@ target_compile_options(mlt PRIVATE ${MLT_COMPILE_OPTIONS})
 target_link_libraries(mlt PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
 
 if(MSVC)
-  target_link_libraries(mlt PRIVATE msvccompat PThreads4W::PThreads4W)
+  target_link_libraries(mlt PRIVATE msvccompat PThreads4W::PThreads4W dirent)
 else()
   target_link_libraries(mlt PRIVATE m)
 endif()

src/modules/xml/consumer_xml.c

@@ -29,6 +29,8 @@
 
 #ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include <direct.h>
 #endif
 
 #define ID_SIZE 128

src/tests/CMakeLists.txt

@@ -18,6 +18,10 @@ function(add_qt_test)
     mlt++
     ${ARG_LINK_LIBRARIES}
   )
+  if(MSVC)
+    target_link_libraries(${_testname} PRIVATE PThreads4W::PThreads4W)
+  endif()
+
   target_include_directories(${_testname} PRIVATE ${arg_INCLUDE_DIRS})
   add_test(NAME "QtTest:${arg_TEST_NAME}" COMMAND ${_testname})
 
@@ -51,12 +55,13 @@ if(MOD_QT6)
   )
 endif()
 
-
-file(GLOB YML_FILES "${CMAKE_SOURCE_DIR}/src/modules/*/*.yml")
-foreach(YML_FILE ${YML_FILES})
-  get_filename_component(FILE_NAME ${YML_FILE} NAME)
-  file(RELATIVE_PATH KWALIFY_TEST_NAME "${CMAKE_SOURCE_DIR}/src/modules" ${YML_FILE})
-  if(NOT FILE_NAME MATCHES "resolution_scale.yml")
-    add_test(NAME "kwalify:${KWALIFY_TEST_NAME}" COMMAND ${Kwalify_EXECUTABLE} -f "${CMAKE_SOURCE_DIR}/src/framework/metaschema.yaml" ${YML_FILE})
-  endif()
-endforeach()
+if(Kwalify_FOUND)
+  file(GLOB YML_FILES "${CMAKE_SOURCE_DIR}/src/modules/*/*.yml")
+  foreach(YML_FILE ${YML_FILES})
+    get_filename_component(FILE_NAME ${YML_FILE} NAME)
+    file(RELATIVE_PATH KWALIFY_TEST_NAME "${CMAKE_SOURCE_DIR}/src/modules" ${YML_FILE})
+    if(NOT FILE_NAME MATCHES "resolution_scale.yml")
+      add_test(NAME "kwalify:${KWALIFY_TEST_NAME}" COMMAND ${Kwalify_EXECUTABLE} -f "${CMAKE_SOURCE_DIR}/src/framework/metaschema.yaml" ${YML_FILE})
+    endif()
+  endforeach()
+endif()

vcpkg.json

@@ -15,6 +15,8 @@
     "libebur128",
     "gdk-pixbuf",
     "rubberband",
-    "libvorbis"
+    "libvorbis",
+    "fftw3",
+    "libexif"
   ]
 }