Merge branch 'cmake-modernise' into devel

d828be82 · Patrik Huber · 56cbd19b · 2eb60193 · d828be82 · d828be82
Commit d828be82 authored Dec 15, 2016 by Patrik Huber
10 changed files
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,25 @@ dist: trusty
 language: cpp

 env:
+  - C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9
  - C_COMPILER=gcc-5 CXX_COMPILER=g++-5
+  - C_COMPILER=clang-3.5 CXX_COMPILER=clang++-3.5
  - C_COMPILER=clang-3.8 CXX_COMPILER=clang++-3.8

 before_install:
  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+  - echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.5 main" | sudo tee -a /etc/apt/sources.list
  - echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 main" | sudo tee -a /etc/apt/sources.list
  - sudo apt-get update -q
-  - sudo apt-get install gcc-5 g++-5 -y
-  - sudo apt-get install clang-3.8 -y
+  - sudo apt-get install g++-4.9 gcc-5 g++-5 -y
+  - sudo apt-get install clang-3.5 clang-3.8 -y
  - sudo apt-get install libboost-all-dev libeigen3-dev libopencv-dev -y

 before_script:
  - mkdir build
  - cd build
-  - cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DBUILD_EXAMPLES=on -DBUILD_UTILS=on -DGENERATE_PYTHON_BINDINGS=on -DPYTHON_EXECUTABLE=`which python3.5` ..
+  - cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DEOS_BUILD_EXAMPLES=on -DEOS_BUILD_UTILS=on -DEOS_GENERATE_PYTHON_BINDINGS=on -DPYTHON_EXECUTABLE=`which python3.5` ..

 script:
  - make VERBOSE=1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-project(eos)
 cmake_minimum_required(VERSION 2.8.12)
+project(eos)
 set(eos_VERSION_MAJOR 0)
 set(eos_VERSION_MINOR 10)
 set(eos_VERSION_PATCH 1)
@@ -7,64 +7,29 @@ set(eos_VERSION ${eos_VERSION_MAJOR}.${eos_VERSION_MINOR}.${eos_VERSION_PATCH})

 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

-# Check if a supported compiler is used and add c++11/14 flag
-include(CheckCXXCompilerFlag)
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-		message(FATAL_ERROR "Need at least gcc 4.8 to compile.")
-	elseif(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.8 OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
-		# This compiles with a warning at the moment, but support for gcc 4.8.x will be removed in the very near future.
-		check_cxx_compiler_flag(-std=c++11 HAS_CXX11_FLAG)
-		if(HAS_CXX11_FLAG)
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-		endif()
-		message(WARNING "Support for gcc 4.8 will be removed in the very near future. Please upgrade your compiler.")
-	else() # gcc version is >4.8
-		check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG)
-		if(HAS_CXX14_FLAG)
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-		endif()
-	endif()
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # the quotes are needed here, maybe because "MSVC" seems to be a keyword
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
-		message(FATAL_ERROR "Visual Studio 2015 or newer is required.")
-	endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	# >=3.5 works, not sure about older versions. Also, libstdc++ from gcc >=4.9 may be needed.
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
-		message(WARNING "Clang below version 3.5 may or may not work. Please upgrade your compiler.")
-	endif()
-	check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG)
-	if(HAS_CXX14_FLAG)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-	endif()
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthreads")
-	# Eigen::LevenbergMarquardt probably needs -pthreads.
-	# Cleaner way would be to add it to fit-model's target_link_libraries, but that requires a CMake >2.8.10.
-else() # no GNU, no MSVC, no Clang
-	message(WARNING "You are using an unsupported compiler. Compilation has only been tested with MSVC, GCC and Clang.")
-	check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG)
-	if(HAS_CXX14_FLAG)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-	endif()
-endif()
+# This sets the C++ standard to c++14 and required for all the following targets that we define.
+# It has no effect on MSVC though - we thus define more specific requirements for each executable target respectively.
+# Also it will not apply to the eos library target, since it is an INTERFACE_LIBRARY, and these properties do not apply to interface libraries.
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF) # This makes CMake use -std=c++11 instead of -std=gnu++11
+# This list is likely not complete, but it should be sufficient to error out on old compilers that we cannot build on:
+set(EOS_CXX_COMPILE_FEATURES cxx_defaulted_functions cxx_generalized_initializers cxx_generic_lambdas cxx_lambdas cxx_nonstatic_member_init cxx_range_for cxx_right_angle_brackets cxx_strong_enums)

 # All the options for building the library. Can be changed on the command-line or in initial_cache.cmake.
 message(STATUS "Options:")
-option(BUILD_EXAMPLES "Build the example applications." ON)
-message(STATUS "BUILD_EXAMPLES: ${BUILD_EXAMPLES}")
-option(BUILD_CERES_EXAMPLE "Build the fit-model-ceres example (requires Ceres)." OFF)
-message(STATUS "BUILD_CERES_EXAMPLE: ${BUILD_CERES_EXAMPLE}")
-option(BUILD_UTILS "Build utility applications." OFF)
-message(STATUS "BUILD_UTILS: ${BUILD_UTILS}")
-option(BUILD_DOCUMENTATION "Build the library documentation." OFF)
-message(STATUS "BUILD_DOCUMENTATION: ${BUILD_DOCUMENTATION}")
-option(GENERATE_PYTHON_BINDINGS "Build python bindings. Requires python to be installed." OFF)
-message(STATUS "GENERATE_PYTHON_BINDINGS: ${GENERATE_PYTHON_BINDINGS}")
-option(GENERATE_MATLAB_BINDINGS "Build Matlab bindings. Requires Matlab with the compiler installed or the Matlab Compiler Runtime." OFF)
-message(STATUS "GENERATE_MATLAB_BINDINGS: ${GENERATE_MATLAB_BINDINGS}")
-
+option(EOS_BUILD_EXAMPLES "Build the example applications." ON)
+message(STATUS "EOS_BUILD_EXAMPLES: ${EOS_BUILD_EXAMPLES}")
+option(EOS_BUILD_CERES_EXAMPLE "Build the fit-model-ceres example (requires Ceres)." OFF)
+message(STATUS "EOS_BUILD_CERES_EXAMPLE: ${EOS_BUILD_CERES_EXAMPLE}")
+option(EOS_BUILD_UTILS "Build utility applications." OFF)
+message(STATUS "EOS_BUILD_UTILS: ${EOS_BUILD_UTILS}")
+option(EOS_BUILD_DOCUMENTATION "Build the library documentation." OFF)
+message(STATUS "EOS_BUILD_DOCUMENTATION: ${EOS_BUILD_DOCUMENTATION}")
+option(EOS_GENERATE_PYTHON_BINDINGS "Build python bindings. Requires python to be installed." OFF)
+message(STATUS "EOS_GENERATE_PYTHON_BINDINGS: ${EOS_GENERATE_PYTHON_BINDINGS}")
+option(EOS_GENERATE_MATLAB_BINDINGS "Build Matlab bindings. Requires Matlab with the compiler installed or the Matlab Compiler Runtime." OFF)
+message(STATUS "EOS_GENERATE_MATLAB_BINDINGS: ${EOS_GENERATE_MATLAB_BINDINGS}")

 # Build a CPack driven installer package:
 include(InstallRequiredSystemLibraries) # This module will include any runtime libraries that are needed by the project for the current platform
@@ -75,9 +40,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${eos_VERSION_PATCH}")
 include(CPack)

 # Find dependencies:
-find_package(OpenCV 2.4.3 REQUIRED core)
-message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
-message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
+find_package(OpenCV REQUIRED core)

 if(MSVC)
 	# The standard find_package for boost on Win finds the dynamic libs, so for dynamic linking to boost we need to #define:
@@ -93,68 +56,71 @@ endif()

 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 find_package(Eigen3 REQUIRED)
-message(STATUS "Eigen3 found: ${EIGEN3_FOUND}")
+message(STATUS "Eigen3 found: ${EIGEN3_FOUND}, version: ${EIGEN3_VERSION}")
 message(STATUS "Eigen3 include dir found at ${EIGEN3_INCLUDE_DIR}")
-message(STATUS "Eigen3 version: ${EIGEN3_VERSION}")

+# Set the include directories of the 3rd-party submodules that we use:
 set(CEREAL_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/cereal-1.1.1/include")
 set(glm_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/glm")
 set(nanoflann_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/nanoflann/include")
 set(eigen3_nnls_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/eigen3-nnls/src")

-# Header files:
+# Header files of the eos library:
 set(HEADERS
-	include/eos/core/Landmark.hpp
-	include/eos/core/LandmarkMapper.hpp
-	include/eos/morphablemodel/PcaModel.hpp
-	include/eos/morphablemodel/MorphableModel.hpp
-	include/eos/morphablemodel/Blendshape.hpp
-	include/eos/morphablemodel/coefficients.hpp
-	include/eos/morphablemodel/EdgeTopology.hpp
-	include/eos/morphablemodel/io/cvssp.hpp
-	include/eos/morphablemodel/io/mat_cerealisation.hpp
-	include/eos/fitting/affine_camera_estimation.hpp
-	include/eos/fitting/orthographic_camera_estimation_linear.hpp
-	include/eos/fitting/nonlinear_camera_estimation.hpp
-	include/eos/fitting/detail/nonlinear_camera_estimation_detail.hpp
-	include/eos/fitting/detail/optional_cerealisation.hpp
-	include/eos/fitting/detail/glm_cerealisation.hpp
-	include/eos/fitting/linear_shape_fitting.hpp
-	include/eos/fitting/contour_correspondence.hpp
-	include/eos/fitting/blendshape_fitting.hpp
-	include/eos/fitting/closest_edge_fitting.hpp
-	include/eos/fitting/fitting.hpp
-	include/eos/fitting/ceres_nonlinear.hpp
-	include/eos/fitting/RenderingParameters.hpp
-	include/eos/render/Mesh.hpp
-	include/eos/render/utils.hpp
-	include/eos/render/render.hpp
-	include/eos/render/render_affine.hpp
-	include/eos/render/detail/render_detail.hpp
-	include/eos/render/detail/render_affine_detail.hpp
-	include/eos/render/texture_extraction.hpp
-	include/eos/render/detail/texture_extraction_detail.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/core/Landmark.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/core/LandmarkMapper.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/PcaModel.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/MorphableModel.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/Blendshape.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/coefficients.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/EdgeTopology.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/io/cvssp.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/morphablemodel/io/mat_cerealisation.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/affine_camera_estimation.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/orthographic_camera_estimation_linear.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/nonlinear_camera_estimation.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/detail/nonlinear_camera_estimation_detail.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/detail/optional_cerealisation.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/detail/glm_cerealisation.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/linear_shape_fitting.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/contour_correspondence.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/blendshape_fitting.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/closest_edge_fitting.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/fitting.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/ceres_nonlinear.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/fitting/RenderingParameters.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/Mesh.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/utils.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/render.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/render_affine.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/detail/render_detail.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/detail/render_affine_detail.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/texture_extraction.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/eos/render/detail/texture_extraction_detail.hpp
 )

+add_library(eos INTERFACE)
+target_compile_features(eos INTERFACE ${EOS_CXX_COMPILE_FEATURES})
 # Add header includes:
-include_directories("include")
-include_directories(${CEREAL_INCLUDE_DIR})
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${OpenCV_INCLUDE_DIRS})
-include_directories(${EIGEN3_INCLUDE_DIR})
-include_directories(${glm_INCLUDE_DIR})
-include_directories(${nanoflann_INCLUDE_DIR})
-include_directories(${eigen3_nnls_INCLUDE_DIR})
+target_include_directories(eos INTERFACE "include")
+target_include_directories(eos INTERFACE ${CEREAL_INCLUDE_DIR})
+target_include_directories(eos INTERFACE ${Boost_INCLUDE_DIRS})
+target_include_directories(eos INTERFACE ${OpenCV_INCLUDE_DIRS})
+target_include_directories(eos INTERFACE ${EIGEN3_INCLUDE_DIR})
+target_include_directories(eos INTERFACE ${glm_INCLUDE_DIR})
+target_include_directories(eos INTERFACE ${nanoflann_INCLUDE_DIR})
+target_include_directories(eos INTERFACE ${eigen3_nnls_INCLUDE_DIR})

 # Custom target for the library, to make the headers show up in IDEs:
-add_custom_target(eos SOURCES ${HEADERS})
-source_group(core include/eos/core/*)
-source_group(morphablemodel include/eos/morphablemodel/*)
-source_group(morphablemodel\\io include/eos/morphablemodel/io/*)
-source_group(fitting include/eos/fitting/*)
-source_group(fitting\\detail include/eos/fitting/detail/*)
-source_group(render include/eos/render/*)
-source_group(render\\detail include/eos/render/detail/*)
+#add_custom_target(eos SOURCES ${HEADERS}) # name it eos-headers?
+source_group(core REGULAR_EXPRESSION include/eos/core/*)
+source_group(morphablemodel REGULAR_EXPRESSION include/eos/morphablemodel/*)
+source_group(morphablemodel\\io REGULAR_EXPRESSION include/eos/morphablemodel/io/*)
+source_group(fitting REGULAR_EXPRESSION include/eos/fitting/*)
+source_group(fitting\\detail REGULAR_EXPRESSION include/eos/fitting/detail/*)
+source_group(render REGULAR_EXPRESSION include/eos/render/*)
+source_group(render\\detail REGULAR_EXPRESSION include/eos/render/detail/*)
+source_group(video REGULAR_EXPRESSION include/eos/video/*)

 # The eos install target:
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include) # our library headers
@@ -168,19 +134,19 @@ install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/nanoflann/COPYING DESTINATION 3rdpart
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/eigen3-nnls/src/ DESTINATION 3rdparty/eigen3-nnls/src) # eigen3-nnls header
 install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/eigen3-nnls/README.md DESTINATION 3rdparty/eigen3-nnls/) # eigen3-nnls attribution

-if(BUILD_EXAMPLES)
+if(EOS_BUILD_EXAMPLES)
 	add_subdirectory(examples)
 endif()

-if(BUILD_UTILS)
+if(EOS_BUILD_UTILS)
 	add_subdirectory(utils)
 endif()

-if(BUILD_DOCUMENTATION)
+if(EOS_BUILD_DOCUMENTATION)
 	add_subdirectory(doc)
 endif()

-if(GENERATE_PYTHON_BINDINGS)
+if(EOS_GENERATE_PYTHON_BINDINGS)
 	set(PYBIND11_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/pybind11")
 	# If this fails, the repo has probably not been cloned with submodules. Run: git submodule update --init
 	add_subdirectory(${PYBIND11_PATH}) # add and initialise pybind11
@@ -189,7 +155,7 @@ if(GENERATE_PYTHON_BINDINGS)
 	install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/LICENSE DESTINATION 3rdparty/pybind11/) # pybind11 licence
 endif()

-if(GENERATE_MATLAB_BINDINGS)
+if(EOS_GENERATE_MATLAB_BINDINGS)
 	add_subdirectory(matlab)
 	install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/mexplus/include/ DESTINATION 3rdparty/mexplus/include) # mexplus headers
 	install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/mexplus/LICENSE DESTINATION 3rdparty/mexplus/) # mexplus licence

--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ At the moment, it mainly provides the following functionality:

 ## Usage

-* Tested with the following compilers: >=gcc-4.8.4, >=clang-3.5, Visual Studio 2015
+* Tested with the following compilers: >=gcc-4.9, >=clang-3.5, Visual Studio 2015
 * Needed dependencies for the library: Boost system (>=1.50.0), OpenCV core (>=2.4.3)

 To use the library in your own project, just add the following directories to your include path:
@@ -34,6 +34,8 @@ To use the library in your own project, just add the following directories to yo
 * `eos/include`
 * `eos/3rdparty/cereal-1.1.1/include`
 * `eos/3rdparty/glm`
+* `eos/3rdparty/nanoflann/include`
+* `eos/3rdparty/eigen3-nnls/src`

 **Make sure to clone with `--recursive` to download the required submodules!**

@@ -82,7 +84,7 @@ The full model is available at [http://www.cvssp.org/facemodel](http://www.cvssp

 ## Python bindings

-_Experimental_: eos includes python bindings for some of its functionality (and more can be added!). Set `-DGENERATE_PYTHON_BINDINGS=on` when running `cmake` to build them (and optionally set `PYTHON_EXECUTABLE` to point to your python interpreter if it's not found automatically).
+_Experimental_: eos includes python bindings for some of its functionality (and more can be added!). Set `-DEOS_GENERATE_PYTHON_BINDINGS=on` when running `cmake` to build them (and optionally set `PYTHON_EXECUTABLE` to point to your python interpreter if it's not found automatically).

 After building the bindings, they can be used like any python module:

@@ -99,7 +101,7 @@ help(eos) # check the documentation

 ## Matlab bindings

-_Experimental_: eos includes Matlab bindings for the `fit_shape_and_pose(...)` function, which means the fitting can be run from Matlab. Set `-DGENERATE_MATLAB_BINDINGS=on` when running `cmake` to build the required mex-file and run the `INSTALL` target to install everything. (Set `Matlab_ROOT_DIR` to point to your Matlab directory if it's not found automatically). More bindings (e.g. the MorphableModel itself) might be added in the future.
+_Experimental_: eos includes Matlab bindings for the `fit_shape_and_pose(...)` function, which means the fitting can be run from Matlab. Set `-DEOS_GENERATE_MATLAB_BINDINGS=on` when running `cmake` to build the required mex-file and run the `INSTALL` target to install everything. (Set `Matlab_ROOT_DIR` to point to your Matlab directory if it's not found automatically). More bindings (e.g. the MorphableModel itself) might be added in the future.

 Go to the `install/eos/matlab` directory and run [`demo.m`](https://github.com/patrikhuber/eos/blob/master/matlab/demo.m) to see how to run the fitting. The result is a mesh and rendering parameters (pose).


--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ install:
 before_build: # We're still in %home%
  - cmd: mkdir build
  - cmd: cd build
-  - cmd: '%cmake% -G "Visual Studio 14 Win64" -DOpenCV_DIR=C:\projects\opencv -DBOOST_ROOT=C:\Libraries\boost_1_59_0 -DBOOST_LIBRARYDIR=C:\Libraries\boost_1_59_0\lib64-msvc-14.0 -DEIGEN3_INCLUDE_DIR=C:\projects\eigen-eigen-ce5a455b34c0 -DCMAKE_INSTALL_PREFIX=..\install -DBUILD_EXAMPLES=on -DBUILD_UTILS=on -DGENERATE_PYTHON_BINDINGS=on -DPYTHON_EXECUTABLE:path=C:\Python35-x64\python.exe ..\eos'
+  - cmd: '%cmake% -G "Visual Studio 14 Win64" -DOpenCV_DIR=C:\projects\opencv -DBOOST_ROOT=C:\Libraries\boost_1_59_0 -DBOOST_LIBRARYDIR=C:\Libraries\boost_1_59_0\lib64-msvc-14.0 -DEIGEN3_INCLUDE_DIR=C:\projects\eigen-eigen-ce5a455b34c0 -DCMAKE_INSTALL_PREFIX=..\install -DEOS_BUILD_EXAMPLES=on -DEOS_BUILD_UTILS=on -DEOS_GENERATE_PYTHON_BINDINGS=on -DPYTHON_EXECUTABLE:path=C:\Python35-x64\python.exe ..\eos'

 build:
  project: C:\projects\build\eos.sln

--- a/cmake/FindEigen3.cmake
+++ b/cmake/FindEigen3.cmake
@@ -9,6 +9,12 @@
 #  EIGEN3_FOUND - system has eigen lib with correct version
 #  EIGEN3_INCLUDE_DIR - the eigen include directory
 #  EIGEN3_VERSION - eigen version
+#
+# This module reads hints about search locations from 
+# the following enviroment variables:
+#
+# EIGEN3_ROOT
+# EIGEN3_ROOT_DIR

 # Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
 # Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
@@ -61,12 +67,22 @@ if (EIGEN3_INCLUDE_DIR)

 else (EIGEN3_INCLUDE_DIR)
  
+  # search first if an Eigen3Config.cmake is available in the system,
+  # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
+  # the script will work as usual
+  find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
+
+  if(NOT EIGEN3_INCLUDE_DIR)
    find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+        HINTS
+        ENV EIGEN3_ROOT 
+        ENV EIGEN3_ROOT_DIR
        PATHS
        ${CMAKE_INSTALL_PREFIX}/include
        ${KDE4_INCLUDE_DIR}
        PATH_SUFFIXES eigen3 eigen
      )
+  endif(NOT EIGEN3_INCLUDE_DIR)

  if(EIGEN3_INCLUDE_DIR)
    _eigen3_check_version()

--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -10,10 +10,8 @@ if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
  find_package(OpenCV 2.4.3 REQUIRED core imgproc highgui)
 elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
  message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
-  find_package(OpenCV 3.0.0 REQUIRED core imgproc imgcodecs)
+  find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
 endif()
-message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
-message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # This allows us to compile in RelWithDebInfo. It'll use the Release-version of OpenCV:
 set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)

@@ -29,19 +27,18 @@ else(Boost_FOUND)
  message(FATAL_ERROR "Boost not found")
 endif()

-if(MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif()
-
 # Simple model fitting (orthographic camera & shape to landmarks) example:
 add_executable(fit-model-simple fit-model-simple.cpp)
-target_link_libraries(fit-model-simple ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(fit-model-simple eos ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(fit-model-simple "$<$<CXX_COMPILER_ID:GNU>:-pthread>$<$<CXX_COMPILER_ID:Clang>:-pthreads>")

 # Model fitting example that fits orthographic camera, shape, blendshapes, and contours:
 add_executable(fit-model fit-model.cpp)
-target_link_libraries(fit-model ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(fit-model eos ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(fit-model "$<$<CXX_COMPILER_ID:GNU>:-pthread>$<$<CXX_COMPILER_ID:Clang>:-pthreads>")
+

-if(BUILD_CERES_EXAMPLE)
+if(EOS_BUILD_CERES_EXAMPLE)
 	# Find Ceres, for the fit-model-ceres app:
 	find_package(Ceres REQUIRED)
 	message(STATUS "Ceres locations: Headers: ${CERES_INCLUDE_DIRS} Library: ${CERES_LIBRARIES}")
@@ -49,13 +46,13 @@ if(BUILD_CERES_EXAMPLE)

 	# Single and multi-image non-linear model fitting with Ceres example:
 	add_executable(fit-model-ceres fit-model-ceres.cpp)
-	target_link_libraries(fit-model-ceres ${CERES_LIBRARIES} ${OpenCV_LIBS} ${Boost_LIBRARIES})
+	target_link_libraries(fit-model-ceres eos ${CERES_LIBRARIES} ${OpenCV_LIBS} ${Boost_LIBRARIES})
 	install(TARGETS fit-model-ceres DESTINATION bin)
 endif()

 # Generate random samples from the model:
 add_executable(generate-obj generate-obj.cpp)
-target_link_libraries(generate-obj ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(generate-obj eos ${OpenCV_LIBS} ${Boost_LIBRARIES})


 # install target:

--- a/initial_cache.cmake.template
+++ b/initial_cache.cmake.template
@@ -30,9 +30,9 @@

 # Configuration options
 # ==============================
-set(BUILD_EXAMPLES ON CACHE BOOL "Build the example applications." FORCE)
-set(BUILD_CERES_EXAMPLE OFF CACHE BOOL "Build the fit-model-ceres example (requires Ceres)." FORCE)
-set(BUILD_UTILS OFF CACHE BOOL "Build utility applications." FORCE)
-set(BUILD_DOCUMENTATION OFF CACHE BOOL "Build the library documentation." FORCE)
-set(GENERATE_PYTHON_BINDINGS OFF CACHE BOOL "Build python bindings. Requires python to be installed." FORCE)
-set(GENERATE_MATLAB_BINDINGS OFF CACHE BOOL "Build Matlab bindings. Requires Matlab with the compiler installed or the Matlab Compiler Runtime." FORCE)
+set(EOS_BUILD_EXAMPLES ON CACHE BOOL "Build the example applications." FORCE)
+set(EOS_BUILD_CERES_EXAMPLE OFF CACHE BOOL "Build the fit-model-ceres example (requires Ceres)." FORCE)
+set(EOS_BUILD_UTILS OFF CACHE BOOL "Build utility applications." FORCE)
+set(EOS_BUILD_DOCUMENTATION OFF CACHE BOOL "Build the library documentation." FORCE)
+set(EOS_GENERATE_PYTHON_BINDINGS OFF CACHE BOOL "Build python bindings. Requires python to be installed." FORCE)
+set(EOS_GENERATE_MATLAB_BINDINGS OFF CACHE BOOL "Build Matlab bindings. Requires Matlab with the compiler installed or the Matlab Compiler Runtime." FORCE)
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -5,8 +5,17 @@ cmake_minimum_required(VERSION 3.7.0)
 find_package(Matlab COMPONENTS MX_LIBRARY REQUIRED)

 # Dependencies of the modules:
-find_package(OpenCV 2.4.3 REQUIRED core)
+#check installed version in order to include the correct OpenCV libraries
+#version variable is defined from project root's CMakeLists
+if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
+  message(STATUS "OpenCV 2.x detected")
+  find_package(OpenCV 2.4.3 REQUIRED core imgproc highgui)
+elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
+  message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
+  find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
+endif()
 set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
+
 if(MSVC)
 	# The standard find_package for boost on Win finds the dynamic libs, so for dynamic linking to boost we need to #define:
 	add_definitions(-DBOOST_ALL_NO_LIB) # Don't use the automatic library linking by boost with VS (#pragma ...). Instead, we specify everything here in cmake.
@@ -21,7 +30,7 @@ matlab_add_mex(
    SRC +eos/+fitting/private/fitting.cpp
    OUTPUT_NAME fitting #[OUTPUT_NAME output_name]
    # DOCUMENTATION +eos/+fitting/fit_shape_and_pose.m # doesn't work - wrong path probably. But it renames the file to fitting.m, so not what we want anyway.
-    LINK_TO ${OpenCV_LIBS} ${Boost_LIBRARIES} #[LINK_TO target1 target2 ...]
+    LINK_TO eos ${OpenCV_LIBS} ${Boost_LIBRARIES} #[LINK_TO target1 target2 ...]
    #[...]
 )


--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -11,10 +11,8 @@ if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
  find_package(OpenCV 2.4.3 REQUIRED core imgproc)
 elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
  message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
-  find_package(OpenCV 3.0.0 REQUIRED core imgproc imgcodecs)
+  find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
 endif()
-message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
-message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # This allows us to compile in RelWithDebInfo. It'll use the Release-version of OpenCV:
 set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)

@@ -30,12 +28,8 @@ else(Boost_FOUND)
  message(FATAL_ERROR "Boost not found")
 endif()

-if(MSVC) # not sure this is required for the python bindings, just keep it for now
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif()
-
 pybind11_add_module(python-bindings generate-python-bindings.cpp pybind11_glm.hpp)
-target_link_libraries(python-bindings PRIVATE ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(python-bindings PRIVATE eos ${OpenCV_LIBS} ${Boost_LIBRARIES})
 set_target_properties(python-bindings PROPERTIES OUTPUT_NAME eos)

 install(TARGETS python-bindings DESTINATION python)

--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -10,10 +10,8 @@ if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
  find_package(OpenCV 2.4.3 REQUIRED core imgproc highgui)
 elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
  message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
-  find_package(OpenCV 3.0.0 REQUIRED core imgproc imgcodecs)
+  find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
 endif()
-message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
-message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # This allows us to compile in RelWithDebInfo. It'll use the Release-version of OpenCV:
 set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)

@@ -29,25 +27,21 @@ else(Boost_FOUND)
  message(FATAL_ERROR "Boost not found")
 endif()

-if(MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif()
-
 # Converts a CVSSP .scm Morphable Model to a cereal binary file:
 add_executable(scm-to-cereal scm-to-cereal.cpp)
-target_link_libraries(scm-to-cereal ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(scm-to-cereal eos ${OpenCV_LIBS} ${Boost_LIBRARIES})

 # Converts a file created with share/convert_bfm2009_to_raw_binary.m to a cereal binary file:
 add_executable(bfm-binary-to-cereal bfm-binary-to-cereal.cpp)
-target_link_libraries(bfm-binary-to-cereal ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(bfm-binary-to-cereal eos ${OpenCV_LIBS} ${Boost_LIBRARIES})

 # Reads an edgestruct CSV file created from Matlab, and converts it to json:
 add_executable(edgestruct-csv-to-json edgestruct-csv-to-json.cpp)
-target_link_libraries(edgestruct-csv-to-json ${Boost_LIBRARIES})
+target_link_libraries(edgestruct-csv-to-json eos ${Boost_LIBRARIES})

 # Store a json file as cereal .bin:
 add_executable(json-to-cereal-binary json-to-cereal-binary.cpp)
-target_link_libraries(json-to-cereal-binary ${OpenCV_LIBS} ${Boost_LIBRARIES})
+target_link_libraries(json-to-cereal-binary eos ${OpenCV_LIBS} ${Boost_LIBRARIES})

 # install target:
 install(TARGETS scm-to-cereal DESTINATION bin)