Commit graph

481 commits

Author SHA1 Message Date
Tadas Baltrusaitis
51f442a3e2 Merge pull request #107 from CJxD/develop
Fix CMake install process for Unix make install
2017-01-03 14:20:34 -05:00
Chris Watts
dbe677db38 Forgot to add fallback define for CONFIG_DIR in FaceLandmarkImg 2016-12-31 16:52:30 +00:00
Chris Watts
4260f6a20e Fix AU and triangulation loading for FaceLandmarkImg and FeatureExtraction 2016-12-29 23:40:03 +00:00
Chris Watts
d21921efdd Include FeatureExtraction in installed bin directory 2016-12-29 23:39:00 +00:00
Chris Watts
c334bf0ac3 Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake 2016-12-29 23:36:10 +00:00
Tadas Baltrusaitis
e0f71fb67c Some renaming to prepare for video scrubbing mode. 2016-12-22 16:08:07 -05:00
Tadas Baltrusaitis
ba07bff894 Update .travis.yml 2016-12-21 21:01:27 -05:00
Tadas Baltrusaitis
e7e77a732b Update .travis.yml 2016-12-21 19:47:01 -05:00
Tadas Baltrusaitis
21130cc4c0 Another clang attempt. 2016-12-21 17:54:07 -05:00
Tadas Baltrusaitis
b38b296f74 More clang issues 2016-12-21 17:23:25 -05:00
Tadas Baltrusaitis
d35a57f122 Still some clang issues. 2016-12-21 17:06:59 -05:00
Tadas Baltrusaitis
3543a09f33 Poss fix. 2016-12-21 16:33:12 -05:00
Tadas Baltrusaitis
c79cf7738a Attempt at clang fix. 2016-12-21 16:07:01 -05:00
Tadas Baltrusaitis
ff2075ee48 TBB for osx 2016-12-21 15:06:48 -05:00
Tadas Baltrusaitis
0a4ddf0bb6 Fixes for clang in ubuntu and directories for osx. 2016-12-21 13:54:45 -05:00
Tadas Baltrusaitis
e1d872878e Typo 2016-12-21 13:19:15 -05:00
Tadas Baltrusaitis
e325179181 no message 2016-12-21 13:09:49 -05:00
Tadas Baltrusaitis
207ce003e6 no message 2016-12-21 13:01:32 -05:00
Tadas Baltrusaitis
9773ab59da Possible typo 2016-12-21 12:55:13 -05:00
Tadas Baltrusaitis
270739c191 Potential fix 2016-12-21 12:48:46 -05:00
Tadas Baltrusaitis
92bfc7014d Trying to figure out why the osx command does not work 2016-12-21 12:47:54 -05:00
Tadas Baltrusaitis
62c143dba9 Another typo fix 2016-12-21 12:42:09 -05:00
Tadas Baltrusaitis
03978e2586 Typo fix. 2016-12-21 12:16:37 -05:00
Tadas Baltrusaitis
179c3296e6 no message 2016-12-21 12:07:15 -05:00
Tadas Baltrusaitis
d62cd462c3 Moving more things to before install 2016-12-21 11:51:36 -05:00
Tadas Baltrusaitis
1050e89318 Something odd with OSX 2016-12-21 11:12:16 -05:00
Tadas Baltrusaitis
6f78c1b92f Another small change. 2016-12-21 10:07:27 -05:00
Tadas Baltrusaitis
52ddc921ff Forgot to save the file. 2016-12-21 09:58:15 -05:00
Tadas Baltrusaitis
55b4dfd928 Some restructure 2016-12-21 09:53:08 -05:00
Tadas Baltrusaitis
b6401a196d Another attempt 2016-12-21 09:36:26 -05:00
Tadas Baltrusaitis
9868965840 Another test 2016-12-20 18:13:49 -05:00
Tadas Baltrusaitis
a48d36e1ae no message 2016-12-20 17:54:54 -05:00
Tadas Baltrusaitis
53119f0bca Travis test 2016-12-20 17:46:48 -05:00
Tadas Baltrusaitis
410fe6aab5 Travis cleanup 2016-12-20 15:34:44 -05:00
Tadas Baltrusaitis
d7e25b12d4 no message 2016-12-20 14:44:37 -05:00
Tadas Baltrusaitis
3919d7e249 Clang related fix. 2016-12-20 14:34:55 -05:00
Tadas Baltrusaitis
4188fb382f A quick fix. 2016-12-20 14:15:09 -05:00
Tadas Baltrusaitis
9960e473eb Realizing the issue with grabbing openCV 3.2 rather than 3.1 2016-12-20 14:00:01 -05:00
Tadas Baltrusaitis
17594952f6 Removing potentially clashing dependencies 2016-12-20 13:42:19 -05:00
Tadas Baltrusaitis
7fff6a00fd Another attempt. 2016-12-20 13:05:35 -05:00
Tadas Baltrusaitis
935b28f571 And another attempt. 2016-12-20 12:29:59 -05:00
Tadas Baltrusaitis
21367b3b3c Another attempt at the fix 2016-12-20 11:58:40 -05:00
Tadas Baltrusaitis
05a58abecc Possible fix for ffmpeg and Ubuntu 14 not loading video properly 2016-12-20 10:37:38 -05:00
Tadas Baltrusaitis
69df6e8b08 Video for linux fix in travis 2016-12-20 09:53:22 -05:00
Tadas Baltrusaitis
d5a056f051 Another small travis issue. 2016-12-19 17:58:41 -05:00
Tadas Baltrusaitis
45fe3a611b Another small travis change. 2016-12-19 15:58:46 -05:00
Tadas Baltrusaitis
f65ebce751 Another travis attempt 2016-12-19 15:29:41 -05:00
Tadas Baltrusaitis
b9e6f53141 More travis fix attempts. 2016-12-19 14:59:25 -05:00
Tadas Baltrusaitis
4d886b4112 Travis changes for OpenCV install 2016-12-19 14:24:35 -05:00
Chris Watts
b33fe0730a Fix the make install process on Unix
Conflicts:
	.gitignore
2016-12-18 00:10:43 +00:00