Commit Graph

755 Commits

Author SHA1 Message Date
7b97047b8e CMake: attempt to fix Boost detection on Fedora 20, which omits -mt. 2013-12-23 16:53:15 +01:00
Martijn Berger
98ed7fa2db More CMakeLists.txt changes
Summary:
I added a function that adds all libdir/* to  CMAKE_PREFIX_PATH :

further there where two places where if(MSVC) else (mingq) where defined after each other. I moved those into one place.
The things common to MSVC and mingw are now blow the special code as we set libdir and such things depending on compiler.

Besides find_package() working and some cleanups there should be no functional changes

Reviewers: dingto

Reviewed By: dingto

Differential Revision: http://developer.blender.org/D127
2013-12-22 23:24:47 +01:00
Martijn Berger
59fd22e1d8 MSVC 2013 cmake changes
Summary:
I think we should try to use find_package more over just setting the variables it would set.
I added find_package with old behavior as a feedback for boost and openexr

@dingto can you test it in msvc2008 setup ?

Reviewers: dingto

Reviewed By: dingto

CC: dingto, brecht

Differential Revision: http://developer.blender.org/D104
2013-12-20 14:32:51 +01:00
Martijn Berger
85a0c5d4e1 Cycles: network render code updated for latest changes and improved
This actually works somewhat now, although viewport rendering is broken and any
kind of network error or connection failure will kill Blender.

* Experimental WITH_CYCLES_NETWORK cmake option
* Networked Device is shown as an option next to CPU and GPU Compute
* Various updates to work with the latest Cycles code
* Locks and thread safety for RPC calls and tiles
* Refactored pointer mapping code
* Fix error in CPU brand string retrieval code

This includes work by Doug Gale, Martijn Berger and Brecht Van Lommel.

Reviewers: brecht

Differential Revision: http://developer.blender.org/D36
2013-12-07 12:26:58 +01:00
Campbell Barton
a10cf5c99e CMake: check CMAKE_C_COMPILER_ID instead of CMAKE_CXX_COMPILER_ID
While its possible to have different C/C++ compilers, we dont support
this at the moment, so just check C compiler ID for now.
2013-12-02 11:36:33 +11:00
683093b5c8 CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix.
It's not needed, this should happen automatically already, and if you build
against libc++ instead (as on recent FreeBSD), this would give build errors.

Ref T37477.
2013-11-28 18:07:57 +01:00
Campbell Barton
2b4c68b902 CMake Build: option to compile without opennl/superlu. 2013-11-25 15:36:19 +11:00
Campbell Barton
d4a11388bf Code Cleanup: warnings 2013-11-22 11:30:40 +11:00
Emanuel Claesson
2479594351 CMake: minor spelling fix for WITH_BOOST
Reviewed By: brecht

Differential Revision: http://developer.blender.org/D26
2013-11-21 17:38:52 +01:00
Jens Verwiebe
02114a6737 OSX/Cmake: workaround for missing OpenGL headers, make sure sdk lookup 2013-11-20 00:39:03 +01:00
Sergey Sharybin
780459e406 Extra unwanted change from the previous commit 2013-11-19 22:25:08 +06:00
Sergey Sharybin
50fbebe0a4 Buildinfo fixes
- Use -M suffix if working tree does have uncommitted
  modifications.
- Local commits are considered local changes as well
2013-11-19 22:22:21 +06:00
965c1357c4 CMake: only enable opencollada by default on OS X and Windows, consistent with scons. 2013-11-19 00:43:44 +01:00
Jens Verwiebe
5eb1dba6e0 Cmake: after lot of times commit checking missed including collada, set on by default now 2013-11-18 14:30:38 +01:00
b764fe58c5 CMake OS X: enable FFMPEG and Quicktime by default to match release and scons. 2013-11-17 15:37:10 +01:00
Jens Verwiebe
f8eb006d09 OSX/cmake: rollback ca5bbe0e419b04d16ee7eb12fa7eaffa0266815a cause OSX versions can have not subversion thus sw_vers -productVersion is not usable for sdk setting 2013-11-15 23:20:38 +01:00
Jens Verwiebe
2b793822ad OSX/cmake: use CMAKE_XCODE_ATTRIBUTE rather than CMAKE_OSX_SYSROOT and set min deployment target to 10.6 now 2013-11-15 20:05:23 +01:00
Jens Verwiebe
ca5bbe0e41 OSX/cmake: simplify system-version detection 2013-11-15 19:26:43 +01:00
Brecht Van Lommel
99c5e71397 Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.

The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
2013-11-06 01:45:15 +00:00
Jens Verwiebe
78d8a14174 OSX: complety remove the cocoa options, definitions and conditionals now 2013-11-05 15:37:59 +00:00
Jens Verwiebe
4e96e04643 OSX/CMake: fix ftemplate condition 2013-10-24 18:46:00 +00:00
Irie Shinsuke
42ac7164e3 Fix for commit r60718. There was a remaining WITH_IMAGE_OPENIMAGEIO in CMakeLists.txt still. 2013-10-13 09:35:54 +00:00
Dalai Felinto
7c2fae19b4 cmake/openimageio - partially reverting #60692
We now have openimageio building when cycles builds or when it's
manually set to build.

(I reverted the _IMAGE_ in the define name because I think the closer
the cmake flags match the defines in the software the better, and there
is no reason to rename all the existent WITH_OPENIMAGEIO references in
CMakeLists.txt - which would be the alternative)
2013-10-12 23:56:21 +00:00
Dalai Felinto
acc6998007 adding url for openimageio project in CMake file (OpenEXR and OpenJpeg do the same) 2013-10-11 16:48:42 +00:00
Dalai Felinto
029f4b9767 adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option
As per Brecht van Lommel's suggestion.
2013-10-11 16:38:04 +00:00
Sergey Sharybin
4bd4037276 Lock-free memory allocator
Release builds will now use lock-free allocator by
default without any internal locks happening.

MemHead is also reduces to as minimum as it's possible.
It still need to be size_t stored in a MemHead in order
to make us keep track on memory we're requesting from
the system, not memory which system is allocating. This
is probably also faster than using a malloc's usable
size function.

Lock-free guarded allocator will say you whether all
the blocks were freed, but wouldn't give you a list
of unfreed blocks list. To have such a list use a
--debug or --debug-memory command line arguments.

Debug builds does have the same behavior as release
builds. This is so tools like valgrind are not
screwed up by guarded allocator as they're currently
are.

--
svn merge -r59941:59942 -r60072:60073 -r60093:60094 \
          -r60095:60096 ^/branches/soc-2013-depsgraph_mt
2013-10-10 11:58:01 +00:00
Dalai Felinto
4abb8fde95 Photoshop PSD support
We now support the combined layer of Photoshop files (stored as layer 0
in the file). This way users can keep their files as multilayer PSD and
Blender always handle them as flat images.

For perfect alpha this requires an OpenImageIO update:
342cc2633f

Photoshop sample files:
https://github.com/OpenImageIO/oiio-images

Brecht has some pending fixes to push for OIIO as well, so we may as
well wait to update our libraries.

What works:
===========
* 8bit images (with or without alpha)
* 16bits images (alpha discarded)
* Photoshop files saved with 'Maximum Compatibility'
* Cycles, Blender internal,  BGE (and player)

Known limitations
(due to OIIO dependency):
=========================
* Images with less than 4 channels show a wrong thumbnail (bug may be in  OIIO)
* Packed images are not supported
* We do not write PSD files.

Note: old Blenders have support for PSD via Quicktime library. But due
to license issues this was discontinued.

Many thanks for Brecht van Lommel for reviewing the patch, suggesting
multiple improvements and to help solving the alpha issue.
2013-10-08 21:17:24 +00:00
Campbell Barton
6aedad4bff fix for crash on load if the file was saved in editmesh,
BKE_mesh_uv_cdlayer_rename_index was checking editmesh pointer before it was NULL'd by direct_link_mesh.
2013-10-07 16:48:26 +00:00
Campbell Barton
1f53674bb8 avoid divide by zero with grid fill (when there is no selection) 2013-10-05 11:59:15 +00:00
Campbell Barton
9b1be7ce93 add cmake option WITH_MEM_VALGRIND, helps to track down errors with mempool use which sometimes only show up as bugs in very rare cases (because even though the element is freed, the chunk is still allocated). 2013-10-03 12:22:44 +00:00
Campbell Barton
c4bad6868f cmake - cached LLVM values would be overwritten on every execution. 2013-09-25 17:04:01 +00:00
Campbell Barton
124f32a206 rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars. 2013-09-25 16:31:54 +00:00
Dalai Felinto
a5c4faef62 CMake: BOOST is a dependency of OpenImageIO 2013-09-24 15:16:46 +00:00
Dalai Felinto
97cb65df52 typos on error messages in CMake 2013-09-23 13:21:27 +00:00
Jens Verwiebe
0c4e665c05 OSX/cmake: fix config by moving code back into xcode conditional, cmake/makefiles does not even have xcode_vesion lookup 2013-09-15 10:56:36 +00:00
Jens Verwiebe
809cb5e478 OSX/cmake: don't try get xcode path from xcode before 4.3, developer dir was not bundled in this case 2013-09-14 12:11:26 +00:00
Jens Verwiebe
7a47803053 OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile 2013-09-13 21:13:57 +00:00
Jens Verwiebe
e59bc04aa7 OSX/cmake: allow for compiling with xcode develper previews by determing xcode-select 2013-09-13 14:57:57 +00:00
Campbell Barton
92d94ccb08 misc minor changes
- make cmake osx use of -ftemplate-depth match scons.
- use array size within sizeof(), more compact.
- replace AT with __func__ where the function is unique enough.
- BLI_box_pack_2D -> 2d to match other functions.
- rename new mesh normal calculation to mesh.calc_normals_split()
2013-09-10 19:23:39 +00:00
Jens Verwiebe
ba13c16065 OSX/cmake: assure finding jack framework 2013-09-10 18:56:33 +00:00
Brecht Van Lommel
d703f616db Fix libmv build error on OS X with Xcode 5. 2013-09-09 12:15:14 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
2013-08-30 20:26:57 +00:00
Thomas Dinges
a51f8e4353 Cycles / Standalone:
* Standalone can now be compiled without the GUI, making the glut dependency optional. 

Added WITH_CYCLES_STANDALONE_GUI cmake flag.
2013-08-30 17:34:27 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Thomas Dinges
ff4e018753 Cycles / Standalone:
* Rename test to standalone.

Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
2013-08-27 02:37:48 +00:00
Campbell Barton
26c0839220 disable cycles when building without python, also use const for function args in more places. 2013-08-07 22:40:03 +00:00
Mitchell Stokes
103ef7cacb Merged changes from trunk r58324-58419. 2013-07-19 22:10:11 +00:00
Campbell Barton
b7826c42df enable type limits warning when compiling with gcc. 2013-07-19 10:39:25 +00:00
Mitchell Stokes
eb21bdd249 Merging changes from trunk r58091-58323. 2013-07-17 01:40:26 +00:00