Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename header #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
9 changes: 7 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ set(SOURCES
src/ConfigData.cpp
)
set(HEADERS
src/ConfigData.h
src/FIFOMap.h
src/ConfigData.hpp
src/FIFOMap.hpp
)

add_library(${PROJECT_NAME} SHARED ${SOURCES})
Expand Down Expand Up @@ -58,6 +58,11 @@ install(TARGETS ${PROJECT_NAME} ${_INSTALL_DESTINATIONS})
# Install headers into mars include directory
install(FILES ${HEADERS} DESTINATION include/configmaps)

# MZ: some compatiblity headers after renaming. keep around for a month, then
# delete.
install(FILES src/ConfigData.h DESTINATION include/configmaps)
install(FILES src/FIFOMap.h DESTINATION include/configmaps)

# Prepare and install necessary files to support finding of the library
# using pkg-config
configure_file(${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
Expand Down
4 changes: 2 additions & 2 deletions doc/configmaps.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The ConfigMap is a nested implementation of std::maps and std::vectors to provid
- double
- bool

An important feature is the loading and storing of ConfigMaps in yaml files. The example shows the usage of ConfigMaps for further details check [ConfigMap](@ref mars::utils::ConfigData.h).
An important feature is the loading and storing of ConfigMaps in yaml files. The example shows the usage of ConfigMaps for further details check [ConfigMap](@ref mars::utils::ConfigData.hpp).

Note: While reading and writing yaml files the order of dictionaries is not necessarily kept.

Expand All @@ -28,7 +28,7 @@ Yaml example file:

Example program:

#include <configmaps/ConfigData.h>
#include <configmaps/ConfigData.hpp>

int main(int argc, char *argv[]) {

Expand Down
2 changes: 1 addition & 1 deletion src/ConfigData.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "ConfigData.h"
#include "ConfigData.hpp"

#include <yaml-cpp/yaml.h>
#include <fstream>
Expand Down
Loading