Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
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
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
9ad6dc14
Commit
9ad6dc14
authored
14 years ago
by
Anthony Mallet
Browse files
Options
Downloads
Patches
Plain Diff
[wip] Remove broken qt system dependency in wip and use qt4-libs from robotpkg
parent
fbb7418e
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
spark-genom/Makefile
+1
-1
1 addition, 1 deletion
spark-genom/Makefile
sysdep/qt.mk
+0
-46
0 additions, 46 deletions
sysdep/qt.mk
with
1 addition
and
47 deletions
spark-genom/Makefile
+
1
−
1
View file @
9ad6dc14
...
...
@@ -107,10 +107,10 @@ GENOM_MODULE= spark
# HRI with BioMove3D
REQD_BUILD_OPTIONS.BioMove3D
:=
jido
include
../../wip/sysdep/qt.mk
include
../../wip/BioMove3D/depend.mk
include
../../interfaces/genBasic-genom/depend.mk
include
../../interfaces/genHum-genom/depend.mk
include
../../architecture/genom/depend.mk
include
../../mk/sysdep/qt4-libs.mk
include
../../mk/robotpkg.mk
This diff is collapsed.
Click to expand it.
sysdep/qt.mk
deleted
100644 → 0
+
0
−
46
View file @
fbb7418e
#
# Copyright (c) 2010 LAAS/CNRS
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice and this list of conditions.
# 2. Redistributions in binary form must reproduce the above copyright
# notice and this list of conditions in the documentation and/or
# other materials provided with the distribution.
#
# Akin Sisbot on 7 Nov 2010
#
# Qt is a software toolkit for developing applications.
# This package contains base tools, like string, xml, and network handling.
DEPEND_DEPTH
:=
${
DEPEND_DEPTH
}
+
QT_DEPEND_MK
:=
${
QT_DEPEND_MK
}
+
ifeq
(+,$(DEPEND_DEPTH))
DEPEND_PKG
+=
qt
endif
ifeq
(+,$(QT_DEPEND_MK))
# ---------------------------------------------
PREFER.qt
?=
system
DEPEND_USE
+=
qt
DEPEND_ABI.qt
?=
qt>
=
4.0
SYSTEM_SEARCH.qt
=
\
include/QtGui/QApplication
\
lib/libQtGui.so
\
lib/libQtOpenGL.so
\
SYSTEM_PKG.Linux-fedora.qt
=
qt
#SYSTEM_PKG.Linux-ubuntu.qt=libforms-dev
#SYSTEM_PKG.Linux-debian.qt=libforms-dev
endif
# QT_DEPEND_MK ---------------------------------------------------
DEPEND_DEPTH
:=
${
DEPEND_DEPTH:+
=
}
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