Moved python bindings to a separate folder

CMakeLists.txt

@@ -60,7 +60,7 @@ 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. Needs BUILD_UTILS enabled too." OFF)
+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}")
@@ -156,13 +156,6 @@ source_group(fitting\\detail include/eos/fitting/detail/*)
 source_group(render include/eos/render/*)
 source_group(render\\detail include/eos/render/detail/*)
 
-# Generate python bindings using pybind11:
-if(GENERATE_PYTHON_BINDINGS)
-	set(PYBIND11_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/pybind11")
-	add_subdirectory(${PYBIND11_PATH})
-	# If this fails, the repo has probably not been cloned with submodules. Run: git submodule update --init
-endif()
-
 # The eos install target:
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include) # our library headers
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/ DESTINATION share) # the model and metadata
@@ -170,8 +163,6 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/ DESTINATION share) # the model and
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/cereal-1.1.1/ DESTINATION 3rdparty/cereal-1.1.1) # cereal headers
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/glm/glm/ DESTINATION 3rdparty/glm/glm) # glm headers
 install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/glm/copying.txt DESTINATION 3rdparty/glm/) # glm licence
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/include/ DESTINATION 3rdparty/pybind11/include) # pybind11 headers
-install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/LICENSE DESTINATION 3rdparty/pybind11/) # pybind11 licence
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/nanoflann/include/ DESTINATION 3rdparty/nanoflann/include) # nanoflann header
 install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/nanoflann/COPYING DESTINATION 3rdparty/nanoflann/) # nanoflann licence
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/eigen3-nnls/src/ DESTINATION 3rdparty/eigen3-nnls/src) # eigen3-nnls header
@@ -189,6 +180,15 @@ if(BUILD_DOCUMENTATION)
 	add_subdirectory(doc)
 endif()
 
+if(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
+	add_subdirectory(python) # the actual bindings
+	install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/include/ DESTINATION 3rdparty/pybind11/include) # pybind11 headers
+	install(FILES ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/LICENSE DESTINATION 3rdparty/pybind11/) # pybind11 licence
+endif()
+
 if(GENERATE_MATLAB_BINDINGS)
 	add_subdirectory(matlab)
 	install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/mexplus/include/ DESTINATION 3rdparty/mexplus/include) # mexplus headers

README.md

@@ -82,7 +82,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 `-DBUILD_UTILS=on` and `-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 `-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).
 
 After building the bindings, they can be used like any python module:
 

initial_cache.cmake.template

@@ -34,5 +34,5 @@ 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. Needs BUILD_UTILS enabled too." 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)

python/CMakeLists.txt

+project(python-bindings)
+cmake_minimum_required(VERSION 2.8.12)
+
+# The python bindings may need a few additional dependencies (e.g. boost filesystem and OpenCV), which are
+# included below - at some point it should be checked if they are really needed.
+
+# Check installed version in order to include the correct OpenCV libraries
+# OpenCV_VERSION_MAJOR is defined from the 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)
+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)
+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)
+
+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.
+	add_definitions(-DBOOST_ALL_DYN_LINK) # Link against the dynamic boost lib - needs to match with the version that find_package finds.
+endif()
+find_package(Boost 1.50.0 COMPONENTS system filesystem program_options REQUIRED)
+if(Boost_FOUND)
+  message(STATUS "Boost found at ${Boost_INCLUDE_DIRS}")
+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})
+set_target_properties(python-bindings PROPERTIES OUTPUT_NAME eos)
+install(TARGETS python-bindings DESTINATION python)

utils/CMakeLists.txt

@@ -49,13 +49,6 @@ target_link_libraries(edgestruct-csv-to-json ${Boost_LIBRARIES})
 add_executable(json-to-cereal-binary json-to-cereal-binary.cpp)
 target_link_libraries(json-to-cereal-binary ${OpenCV_LIBS} ${Boost_LIBRARIES})
 
-# Generate python bindings using pybind11:
-if(GENERATE_PYTHON_BINDINGS)
-	pybind11_add_module(python-bindings generate-python-bindings.cpp pybind11_glm.hpp)
-	target_link_libraries(python-bindings PRIVATE ${OpenCV_LIBS} ${Boost_LIBRARIES})
-	set_target_properties(python-bindings PROPERTIES OUTPUT_NAME eos)
-	install(TARGETS python-bindings DESTINATION bin)
-endif()
 
 # install target:
 install(TARGETS scm-to-cereal DESTINATION bin)