Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-3 into develop

Makefile

@@ -34,12 +34,7 @@ SUDO ?= sudo
 
 CAM_MODELS ?=
 
-CMAKE_BUILD_EXTRA_OPTIONS :=
-ifeq ($(CAM_MODELS),)
-	CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=OFF
-else
-	CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=ON
-endif
+CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=ON
 
 .DEFAULT_GOAL := all
 
@@ -93,18 +88,6 @@ submodules:
 
 .PHONY: submodules
 
-# 3rdparty
-
-ceres:
-	@$(call echo,Make $@)
-	@$(call cmake_build,./3rdparty/ceres-solver-1.11.0/_build,.., \
-		-DCMAKE_INSTALL_PREFIX=$(MKFILE_DIR)/3rdparty/ceres \
-		-DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF \
-		-DMINIGLOG=ON)
-	@cd ./3rdparty/ceres-solver-1.11.0/_build; make install
-
-.PHONY: ceres
-
 # init
 
 init:
@@ -117,11 +100,8 @@ init:
 
 build:
 	@$(call echo,Make $@)
-ifneq ($(CAM_MODELS),)
-	@$(MAKE) ceres
-endif
 ifeq ($(HOST_OS),Win)
-	@$(call cmake_build,./_build,..,-DCMAKE_INSTALL_PREFIX=$(MKFILE_DIR)/_install)
+	@$(call cmake_build,./_build,..,-DCMAKE_INSTALL_PREFIX=$(MKFILE_DIR)/_install $(CMAKE_BUILD_EXTRA_OPTIONS))
 else
 	@$(call cmake_build,./_build,..,$(CMAKE_BUILD_EXTRA_OPTIONS))
 endif
@@ -307,7 +287,6 @@ cleanlog:
 	@$(call rm_f,*FATAL*)
 
 cleanall: clean cleandoc
-	@$(call rm,./3rdparty/ceres-solver-1.11.0/_build/)
 	@$(call rm,./test/gtest/_build/)
 	@$(FIND) . -type f -name ".DS_Store" -print0 | xargs -0 rm -f
 	@$(call rm,./$(PBCVT_DIR)/)