88 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
e2b685de47 FindFFmpeg: Don't report missing components
find_package_handle_standard_args() will take care of that
2021-06-25 12:37:58 -04:00
FeRD (Frank Dana)
93fb2eedf5 Enhance FindFFmpeg.cmake
- Add fallback component version parsing from the individual
  <includedir>/<libname>/version.h headers
- Switch to FFmpeg_<component>_<property> variable names, standard
  for CMake component variables
- No longer probe for non-requested components
- Use HANDLE_COMPONENT in find_package_handle_standard_args
- Parse, export overall FFmpeg_VERSION from libavutil/ffversion.h
2021-06-25 11:46:25 -04:00
Frank Dana
4e4a95c648 Gitlab-CI: Update Windows builder configs, OpenShotAudio linking; enable Windows unit tests (#657)
* Remove no-longer-used cmake Modules

* Don't use OpenShot.h in ExampleHtml.cpp

When `#include`-ing the whole mess, building the file was leading
to what looked like out-of-memory errors. Replacing the monolithic
header with just the necessary ones cleared it up.

* .gitlab-ci.yml: Update for new Windows setup

* Make unit tests work under Windows

- Copying the built and depended (libopenshot-audio) DLLs into
  the unit test dir before building the tests ensures that when
  the test executables are run by the Catch.cmake module to
  discover their contents, the executables will find the DLLs
  they need in order to run.

* Gitlab-ci: Run unit tests on Windows

* Rename openshot-html-example

(The former name, openshot-html-test, was too close to the new
name format for all of our unit test executables, making things
unnecessarily confusing.)

* Rename JuceHeader.h to OpenShotAudio.h

* Github Actions: Install ALSA libs

With the switch to an EXPORTED CMake configuration for
libopenshot-audio, its dependencies become our dependencies.
Which means that CMake now correctly requires that the ALSA
libs be installed.
2021-04-19 15:59:52 -04:00
FeRD (Frank Dana)
8dfaf74177 Fix FindResvg for older CMake 2021-01-13 10:59:34 -05:00
FeRD (Frank Dana)
3854fe9c0e FindOpenShotAudio: Fix linking 2020-10-18 11:14:20 -04:00
FeRD (Frank Dana)
1ae52808c7 CMake: Add target for ImageMagick dependency
- Parameters assigned to ImageMagick::Magick++ will now follow
  the 'openshot' shared-library target wherever it's linked, even in
  build subdirectories that aren't children or siblings of the
  location where the target was created.
- Removed the redundant code duplicating `find_package(ImageMagick)`
  checks. Multiple dependency scans have only been necessary as a
  workaround to overcome CMake variables' restricted scope.
  Targets do not share that limitation.
2020-10-18 10:55:59 -04:00
FeRD (Frank Dana)
4bd3af0c71 Rename FindResvg, target is now Resvg::Resvg 2020-10-18 10:41:53 -04:00
FeRD (Frank Dana)
630e7ac4df Use new OpenShot::Audio target in CMakeLists.txt
FindOpenShotAudio.cmake: Enhance with targets

- Also, migrate as much config as possible from CMakeLists.txt files
  to properties of IMPORTED OpenShot::Audio target (including platform-
  specific configs)
2020-10-18 07:47:36 -04:00
Frank Dana
4e98fb7293 Merge branch 'develop' into develop 2020-09-20 19:23:39 -04:00
Frank Dana
7c9e3f5ebb Merge pull request #3 from ferdnyc/ferdnyc-patch-1
Delete FindZMQ.cmake
2020-05-23 23:16:13 -04:00
FeRD (Frank Dana)
b766baf752 Findjsoncpp: Fix target 2020-04-17 10:01:44 -04:00
FeRD (Frank Dana)
9d261f6568 CMake: Rename, modernize Findjsoncpp.cmake
- Rename to match package naming used elsewhere (official configs)
- Add IMPORTED target creation to the Find module, along with
  version number detection
- Switch to lowercase variable forms (e.g. jsoncpp_FOUND)
2020-04-17 06:54:16 -04:00
Frank Dana
195bc207c1 Merge branch 'develop' into ferdnyc-patch-1 2020-03-27 16:50:52 -04:00
FeRD (Frank Dana)
adf6165083 Add version reporting to FindZeroMQ 2020-03-25 11:57:22 -04:00
Frank Dana
600e8844ee Merge branch 'develop' into add-features 2020-03-01 19:50:52 -05:00
Frank Dana
09e77609d8 Update CodeCoverage.cmake module (#450) 2020-02-26 06:06:32 -05:00
FeRD (Frank Dana)
7ab18fde9f Modernize FindUnitTest++.cmake, add pkg-config
The same old variables will be respected for setting the path, but the
PREFERRED method is defining `-DUnitTest++_ROOT=/path/to` on the
CMake command line. _ROOT variables are handled with extra intelligence
by CMake.

The find module will also attempt to locate the pkg-config file
UnitTest++.pc, and if found will import its data.
2020-02-26 05:28:14 -05:00
FeRD (Frank Dana)
8c53f25091 FindRESVG: Remove debugging messages 2020-01-12 05:27:17 -05:00
FeRD (Frank Dana)
290c7a7e84 Fix FindRESVG for Windows 2020-01-09 01:59:26 -05:00
FeRD (Frank Dana)
8e2bcd00d5 Set IMPORTED_NO_SONAME on RESVG target 2020-01-08 18:47:19 -05:00
FeRD (Frank Dana)
6aa799cb51 FindRESVG: Modernize with targets 2020-01-08 16:45:19 -05:00
FeRD (Frank Dana)
d0e5d061f0 CodeCoverage: import upstream PR changes 2019-12-23 08:18:57 -05:00
FeRD (Frank Dana)
1df9840705 Import CodeCoverage changes 2019-12-15 01:12:07 -05:00
FeRD (Frank Dana)
14dc2b38e2 CodeCoverage: Import upstream changes 2019-12-14 20:23:19 -05:00
FeRD (Frank Dana)
66febac6b1 Lowercase function names, add change comment 2019-12-14 20:21:50 -05:00