Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ArmarXGui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
ArmarXGui
Commits
6216c150
Commit
6216c150
authored
2 years ago
by
Fabian Tërnava
Browse files
Options
Downloads
Patches
Plain Diff
renamed coin includes
parent
1c03f97a
No related branches found
No related tags found
1 merge request
!73
Fix/rename coin3d to coin
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
+5
-5
5 additions, 5 deletions
source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
+7
-7
7 additions, 7 deletions
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
with
12 additions
and
12 deletions
source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
+
5
−
5
View file @
6216c150
...
...
@@ -2,16 +2,16 @@
armarx_component_set_name
(
ArmarXGui
)
armarx_find_qt
(
QtCore QtGui QtDesigner Network
)
find_package
(
Coin
3D
REQUIRED
)
find_package
(
Coin REQUIRED
)
find_package
(
SoQt REQUIRED
)
armarx_build_if
(
Coin
3D
_FOUND
"Coin3D not available"
)
armarx_build_if
(
S
OQT
_FOUND
"SoQt not available"
)
armarx_build_if
(
Coin_FOUND
"Coin3D not available"
)
armarx_build_if
(
S
oQt
_FOUND
"SoQt not available"
)
find_package
(
OpenMP
)
# Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
set
(
COMPONENT_LIBS ArmarXGuiBase ArmarXCore
${
QT_LIBRARIES
}
${
Coin
3D
_LIBRAR
IES
}
${
COIN3D_LIBRARIES
}
${
SoQt_LIBRAR
IES
}
)
set
(
COMPONENT_LIBS ArmarXGuiBase ArmarXCore
${
QT_LIBRARIES
}
${
Coin_LIBRAR
Y_PATH
}
${
SoQt_LIBRAR
Y_PATH
}
)
set
(
SOURCES ArmarXGuiApp.cpp
ArmarXMainWindow.cpp
...
...
@@ -52,7 +52,7 @@ list(APPEND HEADERS ${UI_HEADER})
armarx_gui_library
(
ArmarXGui
"
${
SOURCES
}
"
"
${
HEADERS
}
"
""
""
"
${
COMPONENT_LIBS
}
"
)
target_include_directories
(
ArmarXGui PUBLIC
${
UI_HEADER_DIR
}
)
target_include_directories
(
ArmarXGui SYSTEM PUBLIC
${
Coin
3D
_INCLUDE_DIR
S
}
)
target_include_directories
(
ArmarXGui SYSTEM PUBLIC
${
Coin_INCLUDE_DIR
}
)
target_include_directories
(
ArmarXGui SYSTEM PUBLIC
${
SoQt_INCLUDE_DIRS
}
)
list
(
APPEND COMPONENT_LIBS ArmarXGui
)
...
...
This diff is collapsed.
Click to expand it.
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
+
7
−
7
View file @
6216c150
armarx_set_target
(
"Gui Library: ArmarXGuiBase"
)
find_package
(
Coin
3D
REQUIRED
)
find_package
(
Coin REQUIRED
)
find_package
(
SoQt REQUIRED
)
armarx_build_if
(
Coin
3D
_FOUND
"Coin3D not available"
)
armarx_build_if
(
S
OQT
_FOUND
"SoQt not available"
)
armarx_build_if
(
Coin_FOUND
"Coin3D not available"
)
armarx_build_if
(
S
oQt
_FOUND
"SoQt not available"
)
set
(
LIB_NAME ArmarXGuiBase
)
set
(
LIBS ArmarXCoreJsonObject ArmarXCore
${
Coin
3D
_LIBRAR
IES
}
${
SoQt_LIBRAR
IES
}
)
set
(
LIBS ArmarXCoreJsonObject ArmarXCore
${
Coin_LIBRAR
Y_PATH
}
${
SoQt_LIBRAR
Y_PATH
}
)
set
(
FILES ArmarXWidgetController.cpp
ArmarXComponentWidgetController.cpp
...
...
@@ -91,7 +91,7 @@ armarx_gui_library("${LIB_NAME}"
)
if
(
Coin
3D
_FOUND AND S
OQT
_FOUND
)
target_include_directories
(
${
LIB_NAME
}
SYSTEM PUBLIC
${
Coin
3D
_INCLUDE_DIR
S
}
)
target_include_directories
(
${
LIB_NAME
}
SYSTEM PUBLIC
${
SoQt_INCLUDE_DIRS
}
)
if
(
Coin_FOUND AND S
oQt
_FOUND
)
target_include_directories
(
${
LIB_NAME
}
SYSTEM PUBLIC
${
Coin_INCLUDE_DIR
}
)
target_include_directories
(
${
LIB_NAME
}
SYSTEM PUBLIC
${
SoQt_INCLUDE_DIRS
}
)
endif
()
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