Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
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
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
e1c778a7
Commit
e1c778a7
authored
6 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Made YamlCpp mandatory
parent
cfeb1556
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#3457
passed
6 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+7
-18
7 additions, 18 deletions
CMakeLists.txt
with
7 additions
and
18 deletions
CMakeLists.txt
+
7
−
18
View file @
e1c778a7
...
@@ -135,7 +135,7 @@ ENDIF(cereal_FOUND)
...
@@ -135,7 +135,7 @@ ENDIF(cereal_FOUND)
# YAML with yaml-cpp
# YAML with yaml-cpp
IN
CLUDE
(
${
PROJECT_SOURCE_DIR
}
/cmake_modules/FindYamlCpp.cmake
)
F
IN
D_PACKAGE
(
YamlCpp REQUIRED
)
IF
(
YAMLCPP_FOUND
)
IF
(
YAMLCPP_FOUND
)
MESSAGE
(
"yaml-cpp Library FOUND: yaml-cpp related sources will be built."
)
MESSAGE
(
"yaml-cpp Library FOUND: yaml-cpp related sources will be built."
)
ELSEIF
(
YAMLCPP_FOUND
)
ELSEIF
(
YAMLCPP_FOUND
)
...
@@ -194,7 +194,9 @@ ELSE (SPDLOG_INCLUDE_DIR)
...
@@ -194,7 +194,9 @@ ELSE (SPDLOG_INCLUDE_DIR)
ENDIF
(
SPDLOG_INCLUDE_DIR
)
ENDIF
(
SPDLOG_INCLUDE_DIR
)
INCLUDE_DIRECTORIES
(
${
EIGEN_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
EIGEN_INCLUDE_DIRS
}
)
include_directories
(
"include"
)
INCLUDE_DIRECTORIES
(
"include"
)
INCLUDE_DIRECTORIES
(
${
YAMLCPP_INCLUDE_DIR
}
)
IF
(
Ceres_FOUND
)
IF
(
Ceres_FOUND
)
INCLUDE_DIRECTORIES
(
${
CERES_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
CERES_INCLUDE_DIRS
}
)
ENDIF
(
Ceres_FOUND
)
ENDIF
(
Ceres_FOUND
)
...
@@ -212,10 +214,6 @@ IF(Suitesparse_FOUND)
...
@@ -212,10 +214,6 @@ IF(Suitesparse_FOUND)
INCLUDE_DIRECTORIES
(
${
Suitesparse_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
Suitesparse_INCLUDE_DIRS
}
)
ENDIF
(
Suitesparse_FOUND
)
ENDIF
(
Suitesparse_FOUND
)
IF
(
YAMLCPP_FOUND
)
INCLUDE_DIRECTORIES
(
${
YAMLCPP_INCLUDE_DIR
}
)
ENDIF
(
YAMLCPP_FOUND
)
IF
(
GLOG_FOUND
)
IF
(
GLOG_FOUND
)
INCLUDE_DIRECTORIES
(
${
GLOG_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
GLOG_INCLUDE_DIR
}
)
ENDIF
(
GLOG_FOUND
)
ENDIF
(
GLOG_FOUND
)
...
@@ -351,6 +349,7 @@ SET(HDRS_DTASSC
...
@@ -351,6 +349,7 @@ SET(HDRS_DTASSC
SET
(
HDRS_YAML
SET
(
HDRS_YAML
include/core/yaml/parser_yaml.hpp
include/core/yaml/parser_yaml.hpp
include/core/yaml/yaml_conversion.h
)
)
#SOURCES
#SOURCES
SET
(
SRCS_PROBLEM
SET
(
SRCS_PROBLEM
...
@@ -439,6 +438,8 @@ SET(SRCS_SOLVER
...
@@ -439,6 +438,8 @@ SET(SRCS_SOLVER
src/solver/solver_manager.cpp
src/solver/solver_manager.cpp
)
)
SET
(
SRCS_YAML
SET
(
SRCS_YAML
src/yaml/processor_odom_3D_yaml.cpp
src/yaml/sensor_odom_3D_yaml.cpp
)
)
#OPTIONALS
#OPTIONALS
#optional HDRS and SRCS
#optional HDRS and SRCS
...
@@ -474,18 +475,6 @@ IF (Suitesparse_FOUND)
...
@@ -474,18 +475,6 @@ IF (Suitesparse_FOUND)
#DOES NOTHING?!
#DOES NOTHING?!
#ADD_SUBDIRECTORY(solver_suitesparse)
#ADD_SUBDIRECTORY(solver_suitesparse)
ENDIF
(
Suitesparse_FOUND
)
ENDIF
(
Suitesparse_FOUND
)
# LEAVE YAML FILES ALWAYS IN THE LAST POSITION !!
IF
(
YAMLCPP_FOUND
)
# headers
SET
(
HDRS_YAML
${
HDRS_YAML
}
include/core/yaml/yaml_conversion.h
)
# sources
SET
(
SRCS_YAML
${
SRCS_YAML
}
src/yaml/processor_odom_3D_yaml.cpp
src/yaml/sensor_odom_3D_yaml.cpp
)
ENDIF
(
YAMLCPP_FOUND
)
# create the shared library
# create the shared library
ADD_LIBRARY
(
${
PROJECT_NAME
}
ADD_LIBRARY
(
${
PROJECT_NAME
}
...
...
This diff is collapsed.
Click to expand it.
Joaquim Casals Buñuel
@jcasals
mentioned in issue
#155 (closed)
·
6 years ago
mentioned in issue
#155 (closed)
mentioned in issue #155
Toggle commit list
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