bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
55,745 Commits 2 Branches 0 Tags 745 MiB
1b94b3d49c
Commit Graph

828 Commits

Author SHA1 Message Date
Daniel Genrich
a7875c7c05 Fix linking error on VC 2013: Update lib names for openexr 2014-08-13 09:14:05 +02:00
Jens Verwiebe
7ae187c5e4 OSX/cmake: allow for llvm dynamic builds too, but prefer static 2014-08-06 12:48:06 +02:00
Jens Verwiebe
86e9f84be7 OSX/cmake: move last commited line to a better place 2014-08-05 20:21:22 +02:00
Jens Verwiebe
e4146e6fa3 OSX/cmake: force LLVM_STATIC ON, to fix linking issues 2014-08-05 20:15:44 +02:00
Jason Wilkins
b3faabae2f Fixed linking OIIO on Windows. The debug and optimized options need to be before each individual library in a list. 2014-08-03 11:35:39 -05:00
Jens Verwiebe
02b66f8a55 OSX/buildsystem: prepare usage on OSX 10.10 - Yosemite 
- important: requires cmake >= 2.8.12 to read minor version right,
aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )
 2014-08-03 12:51:35 +02:00
Martijn Berger
bc9bbca41b Move to OIIO 1.4 also for windows x86 2014-08-02 09:59:09 +02:00
Campbell Barton
7b83e3d6d7 CMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO) 2014-08-02 03:08:29 +10:00
Martijn Berger
f51282fc57 Cmake prefers NOT to ! 2014-08-01 15:18:34 +02:00
Martijn Berger
6d7333a2f5 Fix msvc 2013 / win64 to use new OIIO and llvm and resulting linking 
requirements
 2014-08-01 14:28:00 +02:00
Bastien Montagne
5e4a97d109 Default LLVM_STATIC to OFF (it's kinda broken currently, gives various linking issues). 2014-07-30 20:31:13 +02:00
Jens Verwiebe
f557b477ad OSX/cmake: fix linking utf-functions if llvm is disabled 2014-07-29 19:46:15 +02:00
Campbell Barton
02b6ba8874 CMake: use our template for finding the glew library 2014-07-29 03:43:49 +10:00
Sergey Sharybin
c85265b455 Make requests python package to be detected in the same way as numpy 
This solves missing requests package reported on the systems where it's
located in dist-packages rather than in site-packages.

To do this there's now a helper macros which handles both requests and
numpy now and could be used for more packages in the future.

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D686
 2014-07-28 20:53:02 +06:00
Campbell Barton
2d84072ada CMake/MSVC: use '/SAFESEH:NO' linker flag, needed for some systens (D682) 2014-07-27 13:50:21 +10:00
Jens Verwiebe
cd59daca53 OSX/cmake: little tweak for last commit 2014-07-26 18:39:45 +02:00
Jens Verwiebe
d4dadaea96 OSX/cmake: update buildsys for new osl/llvm/oiio usage, also use osx_locals.map in cmake 
- fixes T40887
 2014-07-26 18:10:26 +02:00
Campbell Barton
369d96bacc CMake: use a list for PLATFORM_LINKLIBS 2014-07-25 14:35:53 +10:00
Martijn Berger
490da48d78 Selective changes picked from: e01449fa4bb0df252d32a3b98ee1e8f195923d96 
Author: Jason Wilkins

Improves cmake's ability to find our libraries on Windows / MSVC 2013
 2014-07-15 16:33:05 +02:00
Jens Verwiebe
a83c6293f4 OSX/CMAKE: Way better fix for T40887, checks where failing with clang-omp 
- found a way to feed just extra flags to the testcompiles
 2014-07-08 23:35:04 +02:00
Jens Verwiebe
9605e0bfb6 OSX/CMAKE: extend my former workaround for failing tests with clang-omp to all build types 
- this workaround makes sure the breaking -fopenmp is not exposed to testcompiles which use C_FLAGS respective CXX_Flags
- -fopenmp is always added to the CMAKE_C(XX)_FLAGS_<BUILD_TYPE> now
- another way to solve this would be to move the Configure OpenMP part after all line 2366,
but i don’t know if this would be apreciated
 2014-07-08 17:03:44 +02:00
Jens Verwiebe
ac6b5f2d1d OSX/cmake: more work on T40887 and a tentative fix 
- test fail due libiomp5 is not available @ testing time
- must solve this by adding requred flags/includes to tests
- atm release builds are possible with this hack
 2014-07-08 00:29:53 +02:00
Campbell Barton
ea1f1fe0c2 BLI_string, dont pass unicode to ascii BLI_str_partition functions 2014-07-08 06:06:34 +10:00
Jens Verwiebe
aac283966f OSX/cmake: Real fix for T40887, the reason was find_package(OpenMP) silently failing, breaking all other tests following 
- tested gcc 4.8.1 works again
- tested clang-omp in libs works again
- i assume atm., if we only use vanilla clang it is the one in darwin libs
 2014-07-07 19:20:33 +02:00
Campbell Barton
2e840e56cf CMake: correct include dirs 2014-07-01 09:36:28 +10:00
Jens Verwiebe
a71a8be5cf OSX/cmake: Fix T40887 by detecting if we use an Apple compiler, disable omp in this case 2014-06-30 13:37:10 +02:00
Campbell Barton
b5982f7130 CMake: attempt to resolve OSX+clang failing with OpenMP 2014-06-29 06:19:51 +10:00
Campbell Barton
52f63da512 MSVC: quiet harmless linker warnings 2014-06-27 19:50:34 +10:00
Sergey Sharybin
72b607ab74 Some WITH_TESTS weer not renamed to WITH_GTEST 2014-06-18 22:28:27 +06:00
Sergey Sharybin
306cbb82ec GTest unit testing framework 
Currently covers only small set of functionality.
 2014-06-19 02:09:16 +10:00
Campbell Barton
0eb060c7b4 Move tests into tests/ top-level dir 2014-06-18 22:03:46 +10:00
Dalai Felinto
b4aa51f8d7 CMake fixup for bd43ac04 as indicated by Campbell Barton 2014-06-13 17:24:19 -03:00
Campbell Barton
bd43ac04a5 CMake: quite warnings with 3.0 (without breaking < 3.0 CMakes) 2014-06-11 03:00:57 -03:00
Dalai Felinto
a08275c86a Revert "CMake: quiet warnings with 3.0" 
This reverts commit da7bdf1b47d4490c1a6f35740a9392cb9b5dd42e.

This broke compilation in OSX and some Linux boxes.
Error:  Policy "CMP0043" is not known to this version of CMake

Shall we leave those for after RC (or even 2.71) is out? ;)
 2014-06-11 02:39:16 -03:00
Campbell Barton
da7bdf1b47 CMake: quiet warnigns with 3.0 2014-06-11 13:46:19 +10:00
Matteo F. Vescovi
9b23d9acec Fix compilation error non non-linux architectures 2014-06-02 16:26:38 +06:00
Campbell Barton
b252915b68 CMake/SCons: finish removing MSVC2012 references 2014-05-15 16:16:25 +10:00
Thomas Dinges
2eeab8f191 Windows: Remove support for MSVC 2012 (VC11). 
The officially supported compiled is now MSVC 2013, and MSVC 2008 will be faded out slowly over the coming weeks.
 2014-05-15 07:50:02 +02:00
Sergey Sharybin
678b3cbb4f Proper fix for CMake files 
next time you're deprecating some platform, compiler, feature just either
mail in the ML telling about this or if you're not that lazy poke developers
online whether then can spot issues quick.

Or be ready to pick up stuff being done by the developers your change gives
headache to.
 2014-05-06 04:03:45 +06:00
Campbell Barton
4c47a71e55 CMake: Edit recent commit, allow 64bit msvc2008 2014-05-06 06:13:07 +10:00
Campbell Barton
60c5887fe8 CMake: mark vars as advanced 2014-05-06 06:04:29 +10:00
Campbell Barton
9088604811 Drop support for MSVC versions older then 2013 with CMake 
We get too many complaints about breakage and we intend to drop older versions soon anyway.
 2014-05-06 05:04:25 +10:00
Brecht Van Lommel
741f17f05b Cycles CUDA: make CUDA toolkit 6.0 the official supported version. 
This also updates the configurations to build kernels for compute capability
5.0 cards, when using and older CUDA toolkit version this will be skipped.

Also includes tweaks to improve performance with this version:
* Increase max registers on sm_30, sm_35 and sm_50
* No longer use texture storage on sm_30
 2014-04-30 16:07:27 +02:00
Campbell Barton
b96d531bc9 Python: move to version 3.4x on all platforms 2014-04-30 23:19:16 +10:00
Jens Verwiebe
058bc50799 OSX: tentative fix for D472, ditto creates dirs when needed automatically, also thin out lib. Todo: rather not build the intermediate bins with openmp dependency anyway 2014-04-22 12:27:45 +02:00
Jens Verwiebe
cddbe87ae5 OSX/python: update to py 3.4 2014-04-15 14:12:22 +02:00
Sergey Sharybin
d0c1b44deb CMake: enable OpenMP for all platforms by default 
This is done in SCons and the only reason to disable OpenMP on
Windows was to deal with the express version of compilers.

Now when we are about to switch to msvc2013 by default we can
safely enable OpenMP there since even express version of this
beast supports OpenMP.
 2014-04-14 15:38:34 +06:00
Jens Verwiebe
6e9c2d0c55 OSX/cmake: fix a recently reported dependency issue 2014-04-13 18:04:56 +02:00
Antony Riakiotakis
3ab0a4da73 Enable openmp in MinGW-w64 2014-04-07 19:01:19 +03:00
Campbell Barton
617557b08e Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define 2014-04-01 15:22:28 +11:00