Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
9eb4273e
Commit
9eb4273e
authored
5 years ago
by
d.kilic
Browse files
Options
Downloads
Patches
Plain Diff
Upgraded to qwt 6.1.4 (built with Qt5) and changed .pro accordingly
(changed Order in .pro for Wiki-tut to work)
parent
acbe6680
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
3rdparty
+1
-1
1 addition, 1 deletion
3rdparty
petrack.pro
+5
-5
5 additions, 5 deletions
petrack.pro
with
6 additions
and
6 deletions
3rdparty
@
4bf9fa0e
Compare
3b1a4811
...
4bf9fa0e
Subproject commit
3b1a481187c6f70bc8601e866b19ad8d157a47a6
Subproject commit
4bf9fa0e414735acf45f793495cd1467438eb3cd
This diff is collapsed.
Click to expand it.
petrack.pro
+
5
−
5
View file @
9eb4273e
...
...
@@ -274,8 +274,8 @@ contains(hostname, [zZ][aA][mM]852) {
LIBS
+=
-
lopencv_legacy
$$
{
CVVERSION
}
}
}
else
:
contains
(
hostname
,
ias71
76
)
{
#
Deniz
64
-
Bit
}
else
:
contains
(
hostname
,
ias71
85
)
{
#
imotion
laptop
#
PointGray
PGRPATH
=
"../petrack/3rdparty/windows/triclops-3.4"
...
...
@@ -319,8 +319,8 @@ contains(hostname, [zZ][aA][mM]852) {
message
(
"Build with OpenCV 2.x.x"
)
LIBS
+=
-
lopencv_legacy
$$
{
CVVERSION
}
}
}
else
:
contains
(
hostname
,
ias71
85
)
{
#
imotion
laptop
}
else
:
contains
(
hostname
,
ias71
76
)
{
#
Deniz
32
-
Bit
#
PointGray
PGRPATH
=
"../petrack/3rdparty/windows/triclops-3.4"
...
...
@@ -338,7 +338,7 @@ contains(hostname, [zZ][aA][mM]852) {
INCLUDEPATH
+=
$$
{
CVPATH
}
/
include
/
opencv
INCLUDEPATH
+=
$$
{
CVPATH
}
/
include
/
opencv2
QWTPATH
=
"
C:
/Qwt-6.1.4"
QWTPATH
=
"
../petrack/3rdparty/windows
/Qwt-6.1.4"
#
QWTPATH
=
"D:/petrack/trunk/3rdparty/windows/qwt-6.1.2"
INCLUDEPATH
+=
$$
{
QWTPATH
}
/
include
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment