Jonathan Thomas
272f004c0e
Merge pull request #296 from OpenShot/std-prefixes
...
Remove all 'using namespace' directives from headers
2019-11-17 16:18:14 -06:00
Frank Dana
458c0be919
Merge pull request #365 from ferdnyc/reader-doc-fixes
...
Fix documentation for Qt(Text/Html)Reader
2019-11-17 02:16:42 -05:00
FeRD (Frank Dana)
7bbec4c51c
Fix documentation for Qt(Text/Html)Reader
...
- Some parameters were changed from documented list
- Hash signs need to be escaped if they're not references (links)
2019-11-17 01:49:49 -05:00
Frank Dana
cfcbd800fb
Merge pull request #364 from ferdnyc/find-python-order
...
Reverse order of Python detection
2019-11-17 01:43:54 -05:00
FeRD (Frank Dana)
c131c82be3
Reverse order of Python detection
...
Detecting PythonLibs before PythonInterp can cause a non-default Python
library to be picked up, which then won't match the PythonInterp version
(which always matches the version of the `python3` command).
2019-11-16 23:52:36 -05:00
Frank Dana
c2713520b9
Merge pull request #361 from ferdnyc/travis-clang
...
Add Clang compilation to Travis build matrix
2019-11-04 07:14:04 -05:00
FeRD (Frank Dana)
c002e2b4c9
Add libomp-dev package for Clang
2019-11-04 05:44:47 -05:00
FeRD (Frank Dana)
59e5e6b0aa
Add clang compiling to Travis matrix
2019-11-04 05:30:52 -05:00
Frank Dana
1208a10f1d
Merge pull request #358 from SuslikV/patch-4
...
Clarify some comments
2019-11-02 21:30:41 -04:00
SuslikV
87c06feda1
Clarify some comments
2019-11-02 20:04:58 +02:00
FeRD (Frank Dana)
75e9ba38e6
Merge remote-tracking branch 'upstream/develop' into std-prefixes
2019-11-01 19:59:57 -04:00
Frank Dana
de1327ca10
Fix Windows ZeroMQ for real ( #357 )
...
* Rework FindZeroMQ again for Windows
* Let Windows auto-detect ZeroMQ path
2019-11-01 19:37:13 -04:00
Frank Dana
c0e76e79ef
Merge pull request #356 from ferdnyc/windows-zeromq
...
Fix target creation/importing for ZeroMQ on Windows
2019-11-01 15:47:40 -04:00
FeRD (Frank Dana)
fa3f83d184
FindZeroMQ: Only create valid targets
2019-11-01 15:31:15 -04:00
FeRD (Frank Dana)
d9f3a6b049
Fix ZeroMQ linking on Windows
2019-11-01 15:27:56 -04:00
Frank Dana
c4730da8b5
Merge pull request #355 from ferdnyc/builder-jsoncpp
...
Use bundled JsonCPP on linux builder
2019-11-01 15:09:31 -04:00
Frank Dana
f146f5fe44
Merge pull request #351 from ferdnyc/threading-target
...
Threads: Use IMPORTED target
2019-11-01 15:06:17 -04:00
FeRD (Frank Dana)
be4faaccea
Use bundled JsonCPP on linux builder
2019-11-01 14:58:01 -04:00
Frank Dana
49c3708bf1
Merge branch 'develop' into threading-target
2019-11-01 14:51:54 -04:00
Frank Dana
4311b896df
Merge pull request #348 from ferdnyc/zmq-targets
...
ZeroMQ: Use IMPORTED targets
2019-11-01 14:50:52 -04:00
Frank Dana
5c40094c08
Merge branch 'develop' into zmq-targets
2019-11-01 14:42:08 -04:00
Jonathan Thomas
43bc0eb6b9
Merge pull request #341 from ferdnyc/system-jsoncpp
...
Build: prefer system-installed JsonCpp by default, with bundled fallback
2019-11-01 13:18:42 -05:00
Frank Dana
04724cfcd7
Merge branch 'develop' into zmq-targets
2019-10-30 05:01:24 -04:00
FeRD (Frank Dana)
2535588ad8
Prefixing fixes for QtHtml/QtText Readers
2019-10-30 03:43:11 -04:00
Frank Dana
2560409bb5
Merge branch 'develop' into system-jsoncpp
2019-10-30 03:24:32 -04:00
