Merge branch 'v3.0' into experimental

CMakeConfig/GenConfHeaders.txt

@@ -1,10 +1,13 @@
 # WARNING: Please don't change this file
-if(NOT YAF_REVISION)
-	set(YAF_REVISION "None")
-endif(NOT YAF_REVISION)
+if(NOT YAFARAY_CORE_VERSION)
+	set(YAFARAY_CORE_VERSION "(devel)")
+endif(NOT YAFARAY_CORE_VERSION)
 
+if(DEBUG_BUILD STREQUAL "ON")
+	set(DEBUG "-DEBUG")
+endif(DEBUG_BUILD STREQUAL "ON")
 
 include(CheckIncludeFiles)
 check_include_files(unistd.h HAVE_UNISTD_H)
 configure_file(CMakeConfig/templates/yafray_config.h.cmake ${CMAKE_BINARY_DIR}/yafray_config.h)
-configure_file(CMakeConfig/templates/yaf_revision.h.cmake ${CMAKE_BINARY_DIR}/yaf_revision.h)
+configure_file(CMakeConfig/templates/yaf_version.h.cmake ${CMAKE_BINARY_DIR}/yaf_version.h)

CMakeConfig/UserConfig.template

@@ -14,17 +14,6 @@ set(YAF_USER_CONFIG ON)
 ################################################################################
 
 ############################## Build configuration #############################
-#                                                                              #
-# Build with POSIX threads (pthreads) wrapper instead of                       #
-# native threads wrapper on windows platforms                                  #
-#                                                                              #
-# NOTE: This option is ignored on *nix platforms                               #
-#                                                                              #
-# Default: OFF                                                                 #
-#                                                                              #
-
-set(WITH_Pthreads OFF)
-
 #                                                                              #
 # Build font rendering with FreeType                                           #
 #                                                                              #
@@ -89,16 +78,6 @@ set(WITH_YAF_PY_BINDINGS ON)
 
 set(WITH_YAF_RUBY_BINDINGS OFF)
 
-#                                                                              #
-# Enable release mode building of YafaRay                                      #
-# NOTE: This is only to build YafaRay releases, it controls the version number #
-# shown in yafaray-xml and the "draw parameters" parameters badge              #
-#                                                                              #
-# Default: OFF                                                                 #
-#                                                                              #
-
-set(BUILDRELEASE OFF)
-
 #                                                                              #
 # Enable debug build mode                                                      #
 #                                                                              #
@@ -253,10 +232,10 @@ set(DEBUG_BUILD OFF)
 #                                                                              #
 # Use this variable to set the Python version you want to use for the bindings #
 #                                                                              #
-# Default: 2.6                                                                 #
+# Default: 3.5                                                                 #
 #                                                                              #
 
-#set(YAF_PY_VERSION 3.1)
+#set(YAF_PY_VERSION 3.5)
 
 ############################# Misc. Configurations #############################
 #                                                                              #

CMakeConfig/templates/yaf_version.h.cmake

@@ -0,0 +1,11 @@
+// Header file generated by CMake please don't change it
+
+// This preprocessor macro is set by cmake during building in file yaf_version.h.cmake
+// For example: cmake -DYAFARAY_CORE_VERSION="v1.2.3"
+// the intention is to link the YafaRay Core version to the git information obtained, for example with:
+// cmake /yafaray/src/Core -DYAFARAY_CORE_VERSION=`git --git-dir=/yafaray/src/Core/.git --work-tree=/yafaray/src/Core describe --dirty --always --tags --long`
+
+#ifndef Y_VERSION_H
+#define Y_VERSION_H
+#define YAFARAY_CORE_VERSION "@YAFARAY_CORE_VERSION@@DEBUG@"
+#endif

CMakeConfig/templates/yafray_config.h.cmake

@@ -3,7 +3,7 @@
 #define Y_CONFIG_H
 #include "yafray_constants.h"
 #include <core_api/color_console.h>
-#include <core_api/logging.h>
+#include <core_api/session.h>
 
 #define MIN_RAYDIST @YAF_MIN_RAY_DIST@
 #define YAF_SHADOW_BIAS @YAF_SHADOW_BIAS@
@@ -18,10 +18,5 @@
 
 #cmakedefine HAVE_UNISTD_H 1
 
-__BEGIN_YAFRAY
-typedef float CFLOAT;
-typedef float GFLOAT;
-typedef float PFLOAT;
-__END_YAFRAY
 #endif
 

CMakeLists.txt

@@ -6,7 +6,6 @@ set(CMAKE_COLOR_MAKEFILE ON)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 ####### Options ########
-option(WITH_Pthreads "Build with POSIX threads wrapper on windows platforms" OFF)
 option(WITH_Freetype "Build font rendering with FreeType" ON)
 option(WITH_OpenEXR "Build OpenEXR image I/O plugin" ON)
 option(WITH_JPEG "Build JPEG image I/O plugin" ON)
@@ -16,7 +15,6 @@ option(WITH_XML_LOADER "Build XML Loader" ON)
 option(WITH_YAF_PY_BINDINGS "Enable the YafaRay Python bindings" ON)
 option(WITH_YAF_RUBY_BINDINGS "Enable the YafaRay Ruby bindings" OFF)
 option(WITH_OSX_ADDON "Enable the use of blender's included python lib on OSX platforms" OFF)
-option(BUILDRELEASE "Enable release mode building of YafaRay" OFF)
 option(DEBUG_BUILD "Enable debug build mode" OFF)
 option(FAST_MATH "Enable mathematic approximations to make code faster" ON)
 option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON)
@@ -68,9 +66,12 @@ if(YAF_USER_EXTRA_LIBS)
 endif(YAF_USER_EXTRA_LIBS)
 
 # find the required libs
-FIND_PACKAGE(Boost COMPONENTS system filesystem serialization REQUIRED)
+FIND_PACKAGE(Boost COMPONENTS system filesystem serialization locale REQUIRED)
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
+FIND_PACKAGE(OpenCV COMPONENTS core imgproc photo REQUIRED)
+INCLUDE_DIRECTORIES( ${OpenCV_INCLUDE_DIR} )
+
 find_package(ZLIB REQUIRED)
 find_package(LibXml2 REQUIRED)
 
@@ -81,30 +82,11 @@ else(LIBXML2_FOUND)
 	message("Using LibXML: no")
 endif(LIBXML2_FOUND)
 
-find_package(Threads REQUIRED)
-
 if(WIN32)
 	add_definitions(-DWIN32 )
 	add_definitions(-D_USE_MATH_DEFINES )
 	add_definitions(-D_hypot=hypot )
 endif(WIN32)
-
-# Find optional libs
-if(CMAKE_HAVE_PTHREAD_H)
-	if(WIN32)
-		if(WITH_Pthreads)
-			add_definitions(-DHAVE_PTHREAD)
-			message("Using Posix Threads: yes")
-		else(WITH_Pthreads)
-			message("Using Posix Threads: no (disabled by user)")
-		endif(WITH_Pthreads)
-	else(WIN32)
-		add_definitions(-DHAVE_PTHREAD)
-		message("Using Posix Threads: yes")
-	endif(WIN32)
-else(CMAKE_HAVE_PTHREAD_H)
-	message("Using Posix Threads: no (not found)")
-endif(CMAKE_HAVE_PTHREAD_H)
 
 if(WITH_Freetype)
 	find_package(Freetype REQUIRED)
@@ -262,10 +244,6 @@ if(YAF_USER_EXTRA_DEFS)
 	add_definitions(${YAF_USER_EXTRA_DEFS})
 endif(YAF_USER_EXTRA_DEFS)
 
-if (BUILDRELEASE)
-	add_definitions(-DRELEASE)
-endif (BUILDRELEASE)
-
 # Paths and flags configuration
 
 if(NOT WIN32)