Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prevent outright fail on Linux systems #10

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
be71de7
Add OpenCV include directories to CMakefile.
Nov 6, 2013
0614346
Include unistd.h in map-list utility.
Nov 6, 2013
d3cf9f7
Fix a compilation problem occuring with OpenCV 2.4.6 and Apple LLVM 5.0.
Nov 13, 2013
dbc90c6
Various includes to get face kit to build
schue Apr 29, 2014
02883e1
Missing including a head file: Foundation/NSValue.h.
Mar 30, 2015
4f878b4
Fix a character case error.
Mar 30, 2015
5b42c0a
Make qt-gui build successfully with GNUStep on linux.
Mar 30, 2015
d221892
update .gitignore.
Aug 26, 2015
cda7f33
Fix file name
wenwei-dev Sep 22, 2015
818bad3
Support OpenCV 3.0.0
GeorgeChan Dec 17, 2015
7308c29
First part of the Windows port: fixed compilation errors and warnings
luigivieira Mar 5, 2016
4de4bdb
Create INSTALL.md
CMCDragonkai Mar 6, 2016
ea86b38
Update INSTALL.md
CMCDragonkai Mar 6, 2016
eabf39c
Second part of the Windows port: fixed link errors; upgraded to Qt5
luigivieira Mar 6, 2016
e8feb8b
Fixes for the compilation in Linux
luigivieira Mar 7, 2016
1496fc4
Renamed README to make it a markdown file
luigivieira Mar 8, 2016
3f8a24b
Added missing cpp file to qt-guit project
luigivieira Mar 8, 2016
d3f8d94
Removed compiler flags in Windows - to let VS do its default in debug…
luigivieira Mar 8, 2016
981463e
Fixed potential crash/assert in Warp method used for expression transfer
luigivieira Mar 15, 2016
e09fea3
Implemented installation in CMake scripts
luigivieira Sep 29, 2016
5a99117
Implemented find script (to allow using find_package(CSIRO) in other …
luigivieira Sep 30, 2016
8d633e0
Exporting includes to correct structure; exporting binaries in both d…
luigivieira Oct 1, 2016
c87844a
Set a default search path for most Linux systems
linas Oct 1, 2016
18638d8
Merge pull request #1 from linas/find
linas Oct 1, 2016
f59bd26
Merge branch 'fix/build' of github.com:wenwei-dev/face-analysis-sdk
linas Oct 1, 2016
2dfad82
Merge pull request #2 from hansonrobotics/wheezybuild
linas Oct 1, 2016
c78e916
Revert "Various includes to get face kit to build"
linas Oct 1, 2016
67384c3
Merge pull request #3 from hansonrobotics/revert-2-wheezybuild
linas Oct 1, 2016
34fd9f6
Merge github.com:tetard/face-analysis-sdk into tetard
linas Oct 1, 2016
ffabddd
Merge pull request #4 from linas/tetard
linas Oct 1, 2016
f66ebae
Merge branch 'fix-issue5' of github.com:cook/face-analysis-sdk into cook
linas Oct 1, 2016
d0c6e88
Check for the GUI components in tthe cmakefile
linas Oct 1, 2016
7e54478
Add the needed linker flags to avoid bomb
linas Oct 1, 2016
c815daf
Merge pull request #5 from linas/cook
linas Oct 1, 2016
c5643a6
Merge branch 'ytxie' of github.com:cook/face-analysis-sdk
linas Oct 1, 2016
cdd496e
Merge branch 'master' of github.com:GeorgeChan/face-analysis-sdk into…
linas Oct 1, 2016
826d1be
Revert some of GeorgeChan's changes
linas Oct 1, 2016
ea6b5b5
Merge github.com:MatrixAI/face-analysis-sdk
linas Oct 1, 2016
c2a011d
Merge pull request #6 from linas/chan
linas Oct 1, 2016
3acffde
Simplify the screw cmakefile
linas Oct 1, 2016
93cc276
Merge github.com:luigivieira/face-analysis-sdk into luigivieira
linas Oct 1, 2016
6e50ff8
Misc fixes to get things to compile
linas Oct 1, 2016
3809cb7
Merge pull request #7 from linas/luigivieira
linas Oct 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added missing cpp file to qt-guit project
  • Loading branch information
luigivieira committed Mar 8, 2016
commit 3f8a24bc66ddc071bbf28428b368b7242e1ebd30
5 changes: 3 additions & 2 deletions src/qt-gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ SET(BundleName "qt-gui")

SET(guiFILES "application-states.cpp"
"controllers.cpp"
"command-line-configuration.cpp"
"configuration.cpp"
"gui/avatar-selection.cpp"
"gui/main-window.cpp"
@@ -54,7 +55,7 @@ add_executable(demo-application ${TARGET_TYPE}
main.cpp
command-line-configuration.cpp
${guiFILES}
# ${MOC_SRCS}
${MOC_SRCS}
${EXTRA_SRC})

target_link_libraries(demo-application ${LIBS} Qt5::Widgets clmTracker avatarAnim utilities ${EXTRA_LIBS})
@@ -74,7 +75,7 @@ ADD_EXECUTABLE(${BundleName} ${TARGET_TYPE}
main.cpp
${CONFIG_SRC}
${guiFILES}
#${MOC_SRCS}
${MOC_SRCS}
${EXTRA_SRC}
)
TARGET_LINK_LIBRARIES(${BundleName} ${LIBS} Qt5::Widgets clmTracker avatarAnim ${EXTRA_LIBS})