Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gnss
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
mobile_robotics
wolf_projects
wolf_lib
plugins
gnss
Commits
acd2a394
Commit
acd2a394
authored
4 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Adapt to rename wolf -> wolfcore
parent
29ef3ecf
No related branches found
No related tags found
2 merge requests
!28
release after RAL
,
!27
After 2nd RAL submission
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
cmake_modules/wolfgnssConfig.cmake
+3
-3
3 additions, 3 deletions
cmake_modules/wolfgnssConfig.cmake
with
6 additions
and
6 deletions
CMakeLists.txt
+
3
−
3
View file @
acd2a394
...
@@ -97,7 +97,7 @@ ENDIF(BUILD_EXAMPLES OR BUILD_TESTS)
...
@@ -97,7 +97,7 @@ ENDIF(BUILD_EXAMPLES OR BUILD_TESTS)
#find dependencies.
#find dependencies.
# ============EXAMPLE==================
# ============EXAMPLE==================
FIND_PACKAGE
(
wolf REQUIRED
)
FIND_PACKAGE
(
wolf
core
REQUIRED
)
FIND_PACKAGE
(
gnss_utils REQUIRED
)
FIND_PACKAGE
(
gnss_utils REQUIRED
)
#FIND_PATH(
#FIND_PATH(
...
@@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}/conf")
...
@@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}/conf")
#INCLUDES SECTION
#INCLUDES SECTION
# ==============================
# ==============================
INCLUDE_DIRECTORIES
(
${
wolf_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
wolf
core
_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
gnss_utils_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
gnss_utils_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
BEFORE
"include"
)
INCLUDE_DIRECTORIES
(
BEFORE
"include"
)
...
@@ -270,7 +270,7 @@ endif()
...
@@ -270,7 +270,7 @@ endif()
#Link the created libraries
#Link the created libraries
#===============EXAMPLE=========================
#===============EXAMPLE=========================
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
${
wolf_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
${
wolf
core
_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
${
gnss_utils_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
PLUGIN_NAME
}
${
gnss_utils_LIBRARIES
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/wolfgnssConfig.cmake
+
3
−
3
View file @
acd2a394
...
@@ -70,14 +70,14 @@ FIND_PACKAGE(gnss_utils REQUIRED)
...
@@ -70,14 +70,14 @@ FIND_PACKAGE(gnss_utils REQUIRED)
list
(
APPEND wolfgnss_INCLUDE_DIRS
${
gnss_utils_INCLUDE_DIRS
}
)
list
(
APPEND wolfgnss_INCLUDE_DIRS
${
gnss_utils_INCLUDE_DIRS
}
)
list
(
APPEND wolfgnss_LIBRARIES
${
gnss_utils_LIBRARY
}
)
list
(
APPEND wolfgnss_LIBRARIES
${
gnss_utils_LIBRARY
}
)
if
(
NOT wolf_FOUND
)
if
(
NOT wolf_FOUND
)
FIND_PACKAGE
(
wolf REQUIRED
)
FIND_PACKAGE
(
wolf
core
REQUIRED
)
#We reverse in order to insert at the start
#We reverse in order to insert at the start
list
(
REVERSE wolfgnss_INCLUDE_DIRS
)
list
(
REVERSE wolfgnss_INCLUDE_DIRS
)
list
(
APPEND wolfgnss_INCLUDE_DIRS
${
wolf_INCLUDE_DIRS
}
)
list
(
APPEND wolfgnss_INCLUDE_DIRS
${
wolf
core
_INCLUDE_DIRS
}
)
list
(
REVERSE wolfgnss_INCLUDE_DIRS
)
list
(
REVERSE wolfgnss_INCLUDE_DIRS
)
list
(
REVERSE wolfgnss_LIBRARIES
)
list
(
REVERSE wolfgnss_LIBRARIES
)
list
(
APPEND wolfgnss_LIBRARIES
${
wolf_LIBRARIES
}
)
list
(
APPEND wolfgnss_LIBRARIES
${
wolf
core
_LIBRARIES
}
)
list
(
REVERSE wolfgnss_LIBRARIES
)
list
(
REVERSE wolfgnss_LIBRARIES
)
endif
()
endif
()
\ No newline at end of file
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