Skip to content

Commit

Permalink
Merge pull request #12 from tmcg0/dev
Browse files Browse the repository at this point in the history
merging from dev/ for release
  • Loading branch information
tmcg0 authored Feb 25, 2021
2 parents 6f6c979 + 0322aba commit 70eae20
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
17 changes: 7 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# Set the version number for the library
set (BIOSLAM_VERSION_MAJOR 0)
set (BIOSLAM_VERSION_MAJOR 1)
set (BIOSLAM_VERSION_MINOR 0)
set (BIOSLAM_VERSION_PATCH 0)
math (EXPR BIOSLAM_VERSION_NUMERIC "10000 * ${BIOSLAM_VERSION_MAJOR} + 100 * ${BIOSLAM_VERSION_MINOR} + ${BIOSLAM_VERSION_PATCH}")
Expand All @@ -21,8 +21,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
endif()
# -------------------------------------- #

message(STATUS "+++++++++++++++++++ Beginning CMake of bioslam ${BIOSLAM_VERSION_STRING} ++++++++++++++++++++")

set(PROJECT_DESCRIPTION "IMU + biomechanics estimation toolbox") # for compatibility with CMake 3.8.2
set(CMAKE_CXX_STANDARD 14) # C++ version

Expand Down Expand Up @@ -51,8 +49,8 @@ if(BIOSLAM_BUILD_WITH_MARCH_NATIVE)
else() # don't add flag, tell user compiler doesn't support it
message(STATUS "You requested build with -march=native, but detected compiler does not support it. Leaving this flag out.")
endif()
else() # clear -march=native (in case it was passed by compiler defaults) (todo: figure out how to remove flags in cmake)
message(STATUS "TODO figure out how to remove flags in cmake. current cmake_cxx_flags = ${CMAKE_CXX_FLAGS}. let's hope -march=native isn't in this list.")
else() # clear -march=native (in case it was passed by compiler defaults)
message(STATUS "TODO: remove flags in cmake. current cmake_cxx_flags = ${CMAKE_CXX_FLAGS}. let's hope -march=native isn't in this list.")
endif()
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #

Expand Down Expand Up @@ -237,13 +235,13 @@ install(EXPORT bioslam-export

################################################################################
# Print configuration
message(STATUS "===============================================================")
message(STATUS "================== Bioslam Library Options ==================")
message(STATUS "======================================================================")
message(STATUS "================== Bioslam v${BIOSLAM_VERSION_STRING} Library Options ==================")
message(STATUS "Build tests? : ${BIOSLAM_BUILD_TESTS}")
message(STATUS "Build examples? : ${BIOSLAM_BUILD_EXAMPLES}")
message(STATUS "Build MATLAB wrapper? : ${BIOSLAM_BUILD_MATLAB_WRAPPER}")
message(STATUS "Use TBB? : ${BIOSLAM_USE_TBB}")
message(STATUS "=================== Configuration Options ===================")
message(STATUS "====================== Configuration Options =======================")
message(STATUS "System : ${CMAKE_SYSTEM_NAME}")
message(STATUS "Processer architecture : ${CMAKE_HOST_SYSTEM_PROCESSOR}")
message(STATUS "CMAKE_CXX_COMPILER_ID type : ${CMAKE_CXX_COMPILER_ID}")
Expand All @@ -265,5 +263,4 @@ if(NOT MSVC AND NOT XCODE_VERSION)
message(STATUS " C++ compilation flags (Debug) : ${CMAKE_CXX_FLAGS_DEBUG}")
endif()
endif()
message(STATUS "===============================================================")
message(STATUS "+++++++++++++++++++ End CMake of bioslam ++++++++++++++++++++")
message(STATUS "======================================================================")
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ Bioslam is a C++/MATLAB toolbox for estimation of human skeletal pose from IMU d
<img width="430" height="430" src="https://github.com/tmcg0/bioslam/blob/dev/doc/media/subj_cal_partial.gif">
</p>

## Publications
## Citing Bioslam

If using this software repository, please cite bioslam through the following Zenodo DOI:
[![DOI](https://zenodo.org/badge/321773016.svg)](https://zenodo.org/badge/latestdoi/321773016)

### Core publications
<!-- For now I'm putting all of these in IEEE style without ref numbers and without DOI numbers since I'll provide direct links -->
If using bioslam, please cite the following publication:
If using bioslam, also please cite the following publication:

- T. McGrath and L. Stirling, “Body-Worn IMU Human Skeletal Pose Estimation Using a Factor Graph-Based Optimization Framework,” *Sensors*, vol. 20, no. 23, p. 6887, Dec. 2020. [[link]](https://www.mdpi.com/1424-8220/20/23/6887)

Expand Down

0 comments on commit 70eae20

Please sign in to comment.