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.

Sign up for GitHub

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

Fix the compilation on OSX #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the compilation on OSX #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,7 @@ else()
message(STATUS "Building with build type '${CMAKE_BUILD_TYPE}'")
endif()

if(APPLE)
# The clang compiler (on osx) is somehow much more strict
# than the compilers on ubuntu and so this does not seem
# possible on OSX just yet.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -std=c++11 -fPIC")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -std=c++11 -fPIC")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -std=c++11 -fPIC")

if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm*")
message(STATUS "ARM processor detected, will attempt to use NEON.")
Expand Down
4 changes: 2 additions & 2 deletions okvis_common/include/okvis/FrameTypedefs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ struct MapPoint

typedef std::vector<MapPoint, Eigen::aligned_allocator<MapPoint> > MapPointVector;
typedef std::map<uint64_t, MapPoint, std::less<uint64_t>,
Eigen::aligned_allocator<MapPoint> > PointMap;
Eigen::aligned_allocator<std::pair<const uint64_t, MapPoint> > > PointMap;
typedef std::map<uint64_t, okvis::kinematics::Transformation, std::less<uint64_t>,
Eigen::aligned_allocator<okvis::kinematics::Transformation> > TransformationMap;
Eigen::aligned_allocator<std::pair<const uint64_t, okvis::kinematics::Transformation> > > TransformationMap;

/// \brief For convenience to pass associations - also contains the 3d points.
struct Observation
Expand Down