Commit Graph

318 Commits

Author SHA1 Message Date
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Campbell Barton
e4f7b24e20 disable opencollada and openexr for msvc2010, gives linking errors 2011-06-27 16:33:59 +00:00
Campbell Barton
a961d62653 initialize cmake's CMAKE_BUILD_TYPE to 'Release'
add reference to cmake cache for convenience GNUMakefile
2011-06-27 13:18:08 +00:00
Campbell Barton
4b1cceddbd fix for building with msvc/cmake take 2 (think its correct this time)
also sync build flags with scons.
2011-06-26 17:18:37 +00:00
Mitchell Stokes
3de7a67562 This solves the issue of having symlinks in the LIBDIR path (CMAKE Windows). Hopefully it doesn't break other things. 2011-06-26 08:42:00 +00:00
Campbell Barton
83000d8504 Allow the lib dir to be a symlink, pointed out by Mitchell Stokes. 2011-06-26 06:05:56 +00:00
Nathan Letwory
e7c6b535b0 Remove unnecessary check. OpenAL, SDL, JACK don't depend on samplerate. 2011-06-23 17:29:18 +00:00
Campbell Barton
0767779387 fix for building mingw in debug mode 2011-06-23 16:33:59 +00:00
Campbell Barton
99253abef8 allow building with ffmpeg but not aud 2011-06-23 16:10:48 +00:00
Campbell Barton
bb3742fe91 correction to recent commit & made ffmpeg includes only add when enabled. 2011-06-23 15:58:41 +00:00
Campbell Barton
c3e48219e6 mistake in own commit. 2011-06-23 15:12:05 +00:00
Campbell Barton
2023db70a8 cmake option to build without an audio library. 2011-06-23 09:27:56 +00:00
Campbell Barton
b1b8284f9b fix for python include in msvc 2011-06-19 15:55:49 +00:00
Campbell Barton
c6eaa2300a cmake: add find jack module 2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9 cmake: add find jemalloc module 2011-06-19 14:55:51 +00:00
Campbell Barton
56c0f69071 fix for building opencollada + msvc 2011-06-19 14:14:29 +00:00
Campbell Barton
29977893d3 since cmake new auto-detects many features, print a summery of the configuration on first run. 2011-06-19 13:49:20 +00:00
Campbell Barton
6790dbe9db cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables. 2011-06-19 13:06:21 +00:00
Campbell Barton
77698421b3 fix for building with msvc 2011-06-19 10:19:10 +00:00
Campbell Barton
def6bcd4e5 cmake add module for finding fftw3.
also allow debug blender to build with non debug python
2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67 cmake: add libsamplerate find module 2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f cmake:
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
 useful to create names for debug libs on windows.
2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e cmake: make python search into a find package module. 2011-06-18 15:53:47 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1 added FindSndFile cmake module to replace inline checks. 2011-06-18 12:12:19 +00:00
Campbell Barton
1356082063 fix [#27681] Python: crash assigning a 'set' to an array 2011-06-17 02:22:38 +00:00
Campbell Barton
c02121b708 use full library paths for openexr & msvc, also remove unneeded exr includes 2011-06-15 13:54:57 +00:00
Campbell Barton
4f3936083a replace own inline cmake include search logic for a typical FindXXX.cmake module. 2011-06-15 12:09:02 +00:00
Campbell Barton
1243992f27 cmake: correct uninitialized vars 2011-06-14 00:24:50 +00:00
Campbell Barton
9dd066eb65 cmake: remove python include in the wm module, set opengl as a system include. 2011-06-08 05:39:58 +00:00
Campbell Barton
42ece56e91 don't write file history in backgound mode (running ctest would overwrite all my recent-files.txt), and add an error about mingw/quicktime being unsupported. 2011-06-08 01:53:12 +00:00
Campbell Barton
4a59928484 CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe. 2011-06-04 14:12:55 +00:00
M.G. Kishalmi
9b5800bcd7 fixed "rather then" -> "rather than" typos all over the place 2011-05-28 13:11:24 +00:00
Campbell Barton
2ccdcca7f5 fix for option WITH_CXX_GUARDEDALLOC with msvc 2011-05-24 06:44:39 +00:00
Campbell Barton
b69c1e8f1a CMake changes
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
2011-05-23 14:56:14 +00:00
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Campbell Barton
5cfc13a11d fixed incorrect jemalloc library & updated netbeans project to ignore __pycache__. 2011-05-16 10:34:40 +00:00
Campbell Barton
424a0cca27 option to link with jemalloc on *nix, off by default. 2011-05-12 11:16:32 +00:00
Campbell Barton
1e0c3d315b minor cleanup, no functional changes. 2011-05-09 14:41:44 +00:00
Campbell Barton
07ee0dcc74 build system changes to eltopo, re-applied. 2011-05-02 03:44:02 +00:00
Joseph Eagar
088899236b =trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.

To use, you need to install liblapack and libblas
2011-05-01 21:39:13 +00:00
Campbell Barton
11305bd688 CMake build option for security report: CVE-2009-3850
Nothing is changed by default but some linux distributions want to have executing python be opt-in.

This keeps the same functionality but disables auto-run from factory settings and in background mode unless its enabled as a command line argument.

This CMake option is marked as advanced and wont show in the regular options list so its less likely to be enabled by people that like to turn everything ON without reading descriptions :)
2011-04-28 06:20:47 +00:00
Campbell Barton
6bb626f253 minor changes
- remove some warnings
- fix typos
- cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined)
- cmake, use an explicit list of rna files (don't glob)
2011-04-21 05:49:47 +00:00
Campbell Barton
2d1e663440 patch [#26861] Spelling, Typos, and Grammar
- also fix own bad assert from yesterday & remove testing cmake print.
2011-04-11 01:18:25 +00:00
Sergey Sharybin
1c11e40cb7 Use the same LLIBS set for cmake at Win64 platform as scons uses.
This fixes linking errors occurred recently for me (kinda of SDL
and registry stuff)

Now it works perfectly, thanks to Campbell for tip :)
2011-04-10 14:44:57 +00:00
Campbell Barton
74f3d03969 disable new cloth solver by default. 2011-04-10 06:06:26 +00:00
Campbell Barton
7aed432fc8 eltopo cloth solver couldnt be enabled from cmake, also dont use globbing. 2011-04-10 05:43:34 +00:00
Campbell Barton
5457c871ef change in how cmake works with CMAKE_C_STANDARD_LIBRARIES / CMAKE_CXX_STANDARD_LIBRARIES.
if not defined (first run) these are now set blank but can be defined later.

the problem is that scons & cmake builds would link against different libraries since cmake added its own defaults.
now, by default, scons & cmake have the same libraries.

This fixes an obscure crash in MinGW where cmakes default linking with -ladvapi32 would crash on string formatting which used float precision as an argument, eg:
  printf("%.*f", 3, value);
...without giving a useful backtrace or pointing to the line of code doing the string formatting.
2011-04-09 11:16:37 +00:00
Campbell Barton
1c8d311287 missed setting WITH_BUILTIN_GLEW on non *nux OS's
also made WITH_PYTHON advanced.
2011-04-06 01:51:43 +00:00