Frank Dana
5c40094c08
Merge branch 'develop' into zmq-targets
2019-11-01 14:42:08 -04:00
Frank Dana
04724cfcd7
Merge branch 'develop' into zmq-targets
2019-10-30 05:01:24 -04:00
Frank Dana
2560409bb5
Merge branch 'develop' into system-jsoncpp
2019-10-30 03:24:32 -04:00
Jonathan Thomas
2a1fe80ee9
Merge pull request #352 from ferdnyc/clang-iwyu-fixes
...
Add fixes for Clang/IWYU building, correct juce:: namespacing
2019-10-29 14:03:57 -05:00
Jonathan Thomas
a3eb92e623
Merge pull request #340 from OpenShot/ffmpeg-targets
...
FFmpeg: Create and use targets in CMake build
2019-10-29 13:43:06 -05:00
FeRD (Frank Dana)
b6da6b9659
add DONT_SET_USING_JUCE_NAMESPACE to tests
2019-10-27 03:54:36 -04:00
FeRD (Frank Dana)
a1034046a2
ZeroMQ: Use IMPORTED targets
...
- Adopt FindZeroMQ.cmake from cppzmq, and use its `libzmq` target
- Also use `cppzmq` target, if created
2019-10-26 07:24:28 -04:00
FeRD (Frank Dana)
645946458b
DISABLE_TESTS covers entire tests/ dir
2019-10-26 07:22:01 -04:00
Frank Dana
13e68c368e
Merge branch 'develop' into ffmpeg-targets
2019-10-25 02:03:10 -04:00
Frank Dana
d99bba83b4
Merge branch 'develop' into system-jsoncpp
2019-10-22 20:33:39 -04:00
Jonathan Thomas
3f5370a84c
Merge pull request #330 from ferdnyc/enable-make-test
...
Re-enable 'make test' when possible (requires CMake 3.11+)
2019-10-22 18:49:23 -05:00
Jonathan Thomas
bf82289dc1
Merge pull request #339 from ferdnyc/tests-tolerance
...
tests: Add tolerance to pixel value checks
2019-10-22 18:35:19 -05:00
Jonathan Thomas
144d52d480
Merge pull request #329 from ferdnyc/cppzmq-detect
...
CMakeLists: Also detect cppzmq headers
2019-10-22 18:32:26 -05:00
Jonathan Thomas
5a2fe8b47c
Merge pull request #344 from ferdnyc/openmp-required
...
CMake: REQUIRE OpenMP, use (or create) targets for dependency propagation
2019-10-22 17:21:43 -05:00
Frank Dana
ca885d59e0
Merge pull request #315 from ferdnyc/exception-default-args
...
Exceptions: Make (most) file_path args optional
2019-10-11 21:46:43 -04:00
FeRD (Frank Dana)
d768c89ad7
Merge branch 'develop' into openmp-required
2019-10-08 16:33:35 -04:00
FeRD (Frank Dana)
582a76a8a7
CMake: REQUIRE OpenMP, use (or create) targets
...
OpenMP is now REQUIRED as the build will fail if it's not available.
This PR updates the `find_package`, and creates the necessary targets
for older CMake versions (3.9+ will do it automatically).
The targets are then made PUBLIC dependencies of the openshot
target, which causes the OpenMP configs to automatically propagate.
The redundant OpenMP detection is removed from test/CMakeLists.txt.
The detection code comes verbatim from this post, which also credits
Modern CMake: https://iscinumpy.gitlab.io/post/omp-on-high-sierra/
2019-10-08 16:30:10 -04:00
FeRD (Frank Dana)
7a9567e7ab
Reverse JsonCpp logic, prefer system-installed
2019-10-03 02:50:39 -04:00
FeRD (Frank Dana)
6502c2a6b2
CMake: Link with FFmpeg:: targets
2019-10-02 09:29:15 -04:00
FeRD (Frank Dana)
39de350f1c
tests: Add tolerance to pixel value checks
2019-10-02 04:44:13 -04:00
FeRD (Frank Dana)
ee4666f15b
Fix indentation
2019-09-25 05:53:00 -04:00
FeRD (Frank Dana)
986f567ebf
CMake: Eliminate duplicate include dirs
2019-09-25 01:22:53 -04:00
FeRD (Frank Dana)
1ec431f446
Simplify CMakeLists with loops
2019-09-25 01:05:59 -04:00
FeRD (Frank Dana)
25ebb24b36
Re-enable 'make test' on CMake 3.10+
2019-09-16 10:41:49 -04:00
FeRD (Frank Dana)
9b9e4a7008
CMakeLists: Also detect cppzmq
...
We don't _just_ use the ZeroMQ library, we also use the cppzmq bindings.
Previously we weren't detecting for those at all. This adds a check for
its configs, and adds its target to the openshot target linking (even
though it's a header-only library).
2019-09-15 09:21:01 -04:00
