From ea7a8ae60b4e03149844a0e8e23aa122ae957e6e Mon Sep 17 00:00:00 2001 From: gineshidalgo99 Date: Wed, 6 Jun 2018 17:53:52 -0400 Subject: [PATCH] Fixed Mac issues --- CMakeLists.txt | 7 +++++-- doc/installation.md | 2 ++ src/openpose/calibration/cameraParameterEstimation.cpp | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b703b8d..59a4e711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,9 @@ cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR) # min. cmake version recommend ### Extra functionality include(cmake/Utils.cmake) +if (NOT WIN32 AND NOT UNIX AND NOT APPLE) + message(FATAL_ERROR "Unsupported operating system. Only Windows, Mac and Unix systems supported.") +endif (NOT WIN32 AND NOT UNIX AND NOT APPLE) ### FLAGS @@ -204,13 +207,13 @@ endif (UNIX AND NOT APPLE) option(WITH_FLIR_CAMERA "Add FLIR (formerly Point Grey) camera code (requires Spinnaker SDK already installed)." OFF) # Set the acceleration library -if (WIN32) +if (WIN32 OR APPLE) set(WITH_EIGEN NONE CACHE STRING "Select the Eigen mode (NONE if not required or DOWNLOAD to let OpenPose download it).") set_property(CACHE WITH_EIGEN PROPERTY STRINGS NONE BUILD) elseif (UNIX AND NOT APPLE) set(WITH_EIGEN NONE CACHE STRING "Select the Eigen mode (NONE if not required, APT_GET if you used `sudo apt-get install libeigen3-dev`, BUILD to let OpenPose download it).") set_property(CACHE WITH_EIGEN PROPERTY STRINGS NONE APT_GET BUILD) -endif (WIN32) +endif (WIN32 OR APPLE) # # Suboptions for OpenPose tracking # if (UNIX AND NOT APPLE) diff --git a/doc/installation.md b/doc/installation.md index a8e840fe..4699cd8a 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -27,6 +27,8 @@ OpenPose - Installation ## Windows Portable Demo This installation section is only intended if you plan to modify the OpenPose code or integrate it with another library or project. If you just want to use the OpenPose demo in Windows, simply use the latest version of the OpenPose binaries which you can find in the [Releases](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases) section. +**NOTE**: Read the `Instructions.txt` to learn to download the models required by OpenPose (about 500 Mb). + ## Operating Systems diff --git a/src/openpose/calibration/cameraParameterEstimation.cpp b/src/openpose/calibration/cameraParameterEstimation.cpp index 3f514524..41c81b7b 100644 --- a/src/openpose/calibration/cameraParameterEstimation.cpp +++ b/src/openpose/calibration/cameraParameterEstimation.cpp @@ -1,4 +1,5 @@ #include +#include // std::accumulate #include #ifdef WITH_EIGEN #include -- GitLab