Jonathan Thomas
b4be3dca3d
Merge branch 'develop' into example
2019-04-16 16:33:16 -05:00
Jonathan Thomas
88bb9fc41f
Merge pull request #214 from ferdnyc/if-policy
...
Use if(POLICY) with CMake
2019-04-16 16:32:26 -05:00
FeRD (Frank Dana)
2748e9a2a2
Use if(POLICY)
...
I somehow missed that `if(POLICY CMPxxxx)` exists to wrap `cmp_policy()`
calls so only CMake versions that understand that policy attempt to set
it. Which is way smarter than the version-based logic I was using.
2019-04-06 19:24:32 -04:00
Frank Dana
e7b50246ae
Merge branch 'develop' into example
2019-04-06 19:00:17 -04:00
Jonathan Thomas
101f25a7f5
Merge pull request #212 from ferdnyc/tilde-files
...
Remove accidentally-committed tilde files
2019-04-06 14:10:04 -05:00
Jonathan Thomas
6da838c733
Merge branch 'develop' into tilde-files
2019-04-06 13:37:04 -05:00
Jonathan Thomas
5caef7b6cf
Merge pull request #213 from OpenShot/fix-python-install-cmake3
...
Fixing python install logic for GitLab
2019-04-06 13:36:26 -05:00
Jonathan Thomas
62a68aac13
Fixing python install logic in gitlab (since we've changed the prefix of where it's installed)
2019-04-06 13:19:06 -05:00
Jonathan Thomas
27109df19b
Merge pull request #211 from OpenShot/rename-cmake-test
...
Fix cmake 3 error for `make test`
2019-04-06 13:01:39 -05:00
Jonathan Thomas
6e7b989b93
Removing policy experiment
2019-04-06 12:34:29 -05:00
Jonathan Thomas
496183ce90
change make test to make os_test (due to changes in cmake 3)
2019-04-06 11:05:59 -05:00
FeRD (Frank Dana)
ab46eea1c4
Remove accidentally-committed tilde files
...
I snuck `src/bindings/*/CMakeLists.txt~` files into one of my
recent commits somehow. This commit removes them, and adds an
explicit `*~` to `.gitignore` to help prevent a repeat occurrence.
2019-04-06 06:17:44 -04:00
Jonathan Thomas
dbc6e8ec61
Attempt to fix cmake "test" reserved word error
2019-04-05 17:40:38 -05:00
Jonathan Thomas
b1f1df7dcd
Attempt to fix cmake "test" reserved word error
2019-04-05 17:10:29 -05:00
Jonathan Thomas
d3cd4f3a2e
Merge pull request #210 from ferdnyc/cmake-version
...
Cmake 3.1+ project updates (and 3.12+ SWIG build fixes)
2019-04-05 16:54:42 -05:00
FeRD (Frank Dana)
42e2c9912b
Re-enable C lang for old CMake
2019-04-05 17:32:34 -04:00
Frank Dana
8ccee3483a
Merge branch 'develop' into example
2019-04-05 02:23:04 -04:00
FeRD (Frank Dana)
f26978d889
tests/CMakeLists.txt: Use generic PROJECT_SOURCE_DIR
...
(Previously it was using the variable `${openshot_SOURCE_DIR}`
which assumes the project name is "openshot" — but it changed.)
2019-04-05 01:08:38 -04:00
FeRD (Frank Dana)
f3c35da5c8
Don't break older cmake with new policy
2019-04-05 00:49:27 -04:00
FeRD (Frank Dana)
268e72aaf3
Update copyright and cmake output
2019-04-05 00:07:59 -04:00
FeRD (Frank Dana)
3d8c2412f0
Bindings build in CMake 3.1-3.14+
2019-04-05 00:07:59 -04:00
FeRD (Frank Dana)
708f3254ca
Modernize project for CMake 3.1+
2019-04-05 00:07:59 -04:00
FeRD (Frank Dana)
6ee1ab17a4
Use updated, improved UseDoxygen.cmake
2019-04-05 00:07:59 -04:00
Jonathan Thomas
4c5851df28
Merge pull request #209 from OpenShot/juce5
...
Upgrade to JUCE 5 (thanks @ferdnyc)
2019-04-04 20:52:22 -05:00
Jonathan Thomas
85a10291f6
Updating Qt apt repository for xenial
2019-04-04 20:38:39 -05:00
