| Age | Commit message (Collapse) | Author |
|---|
|
|
|
D631 by mva
|
|
|
|
Brings new bounds limiting and also prepares build system
for the changes in the upstream.
Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.
This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D581
|
|
Conflicts:
CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp
|
|
Needed to make the blender link libraries a global property
now that tests are parallel to source directory.
Current sort order for blender link libraries doesn't work
for tests that start with few defined symbols. Doubling the
lib list works, but a TODO to find a better way (probably
using CMake's own mechanism for tracking dependencies).
|
|
|
|
Currently covers only small set of functionality.
|
|
This is because of blender-tiles branch we've got..
|
|
|
|
This could have lead to situation when CMake wouldn't re-generate
.mo file from changed .po file.
|
|
Documentation to appear here:
http://wiki.blender.org/index.php/User:Jwilkins/VFX/GHOST_Refactor_for_EGL
Missing from this commit is support for systems other than Windows.
This also only builds with CMake.
|
|
Cmake bug(?) workaround for zlib and png:
FindPNG.cmake calls find_package(zlib) and for some reason that redundant call
causes both zlib and png to not be found properly.
(Or, at least they complain, as this does not seem to cause a build error later)
Since zlib will be found by find_package(png),
it should be OK to not call find_package(zlib) explicitly.
Setting JPEG_NAME seems to be required by any version of MSVC, not just 9,
so changed check from MSVC09 to just MSVC
The proper Boost static libraries are not found unless the following variables are set:
set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
set(Boost_USE_MULTITHREADED ON) # suffix -mt
set(Boost_USE_STATIC_LIBS ON) # suffix -s
Note: The debug versions of the opencollada libraries are missing from windows_v12,
but this cannot be worked around (except to disable opencollada for debug builds)
because the value of _ITERATOR_DEBUG_LEVEL is different between opencollada and the
rest of Blender, so cannot just use the release versions with a debug build.
The fix would be to add the _d versions to the library directory.
Set /SAFESEH:NO to fix linker error related to libjpeg
(not sure why libjpeg is not compatible with this flag)
Also quiets warning about ignoring /EDITANDCONTINUE due to having /SAFESEH enabled
Some typos in buildinfo.cmake fixed.
In buildinfo.cmake, trying to determine if a branch is modified when it
has no upstream branch kills the build, so added ERROR_QUIET where upstream
check was done.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Using unordered_map and unordered_set C++ container types currently
requires careful testing or usage of boost, due to the various confusing
C++ version differences in include paths and namespaces.
Libmv defines tests for these cases in cmake and scons, such that ceres
can use any available implementation, or fall back too std::map/std::set
if none can be found.
This patch generalizes this buildfile code by providing a Blender macro.
* cmake: defines both the variables used by libmv at them moment as well
as 2 variables UNORDERED_MAP_INCLUDE_PREFIX and UNORDERED_MAP_NAMESPACE,
which can later be used in other C++ parts for convenience.
* scons: adds a tool script returning the include prefix and namespace.
Libmv checks these to define the appropriate definitions for ceres.
Differential Revision: https://developer.blender.org/D425
|
|
We wouldn't really have release branches, building will happen
from annotated tags.
Made it so building tag revision equals to a master branch.
|
|
The script ##cmake_linux_install.sh## is currently invoking ##make## in single-threaded mode; this patch changes it to take advantage of all available CPU threads.
Reviewers: mont29
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D358
|
|
Branch name and hash didn't work properly when having disconnected
HEAD or when having current HEAD below upstream.
|
|
Updating rpms built from 'make package' has issues using the git hash since it isn't in a set order like svn commits, this lets it use the date to determine if the rpm is newer than the installed version.
Also updates the license text.
|
|
|
|
Now changing UI_icons.h causes icons to be re-generated, without this
adding a new icon wouldn't automatically get into the generated PNG.
|
|
On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine.
Reviewed by: Brecht
Differential Revision: https://developer.blender.org/D228
|
|
|
|
can use your system ones instead of those built by install_deps!
|
|
was not found.
Weird library names having version suffix (e.g. libIex-2_1.so) are used only
when the OpenEXR was built with CMake. Building the library with the Autotools
doesn't add the version suffix.
|
|
this allows for updating icons without committing a new PNG each time
(which is inefficient with git). The data files are converted into a
PNG at builds time and used just as they were before.
|
|
|
|
|
|
OIIO/OSL source).
|
|
|
|
Note that I also updated OpenEXR to 2.1.0 (and updated our CMake openexr module as well).
Users will have to update their build settings as told by the script (also in BUILD_NOTES.txt generated file)!
Note I removed all ugly patches from this script, we are currently using custom git repo for OpenEXR/OIIO/OSL,
hopefully we will soon be able to use vanillia code from official repos!
|
|
While its possible to have different C/C++ compilers, we dont support
this at the moment, so just check C compiler ID for now.
|
|
Before this console output contained messages about branch is not
configured to use any upstream branch which is not useful information
at all.
|
|
|
|
Ok, this is nasty. SOURCE_DIR is somehow being defined
from CMakeLists.txt in source/creator by the looks of it
and actual issue as extra slash in the end of path which
was passing to EXISTS command.
|
|
- It was using SOURCE_DIR which is undefined on windows.
No idea why it was defined on Linux, could be some
co-incident. Correct usage is CMAKE_SOURCE_DIR.
- Remove usages of SVN's revision.
|
|
Before this hash of latest local commit was used,
which is not so much useful since nobody can access
that commit hash.
|
|
|
|
- Use -M suffix if working tree does have uncommitted
modifications.
- Local commits are considered local changes as well
|
|
- Better to set branch/hash to "unknown" so
it's clear build is done from exported tree.
- SCons used to reference undefined variable.
|
|
Title says it all :)
Pointer by IRIE Shinsuke in the ML, thanks!
|
|
Summary:
Old idea with changes since previous release tag
didn't work good enough. In most of the cases tag
was done in a branch hence not actually reachable
from the master branch.
Now change since release is gone, and date of
the latest commit is used instead.
The date is displayed in format YYYY-MM-DD HH:mm
in the splash.
New bpy.app fields:
- build_commit_timestamp is an unix timestamp of
the commit blender was build from.
- build_commit_date is a date of that commit.
- build_commit_time is a time of that commit.
Reviewers: campbellbarton
Differential Revision: http://developer.blender.org/D5
|
|
Left it there by an accident.
|
|
Made it so if there's release/datafiles/locale/po
folder, then all the .po files will be converted
to .mo at blender compile time and installed to
an appropriate location.
Uses small own implementation msgfmt which is
based on msgfmt.py from Python project, but also
supports contexts.
There's no functional changes for until we've
switched to use source .po files instead of
pre-compiled .mo.
P.S. Well, there's one change which is msgfmt.cc
being compiled even if it's not used, but
would rather not clutter code with checks
since pretty soon we'll use this program
anyway.
|
