Campbell Barton
5b04685f49
handy cmake list macros for inserting items into a list before/after existing items
2012-07-16 08:26:42 +00:00
Campbell Barton
c8c743b609
code cleanup: compile with clang and quiet some warnings.
2012-06-28 12:32:06 +00:00
Campbell Barton
0c8ebad16e
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.
2012-06-23 14:23:44 +00:00
Campbell Barton
263be14811
rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.
2012-06-23 13:42:14 +00:00
Campbell Barton
1e45042396
code cleanup: remove mode comments, these were applied very un-evenly across a few files.
2012-05-27 13:22:43 +00:00
Daniel Genrich
7f92b5f79a
Fix El Topo:
...
- Library compile errors
- 2 Bugs (have been reported to lib owner)
- LAPACK for cmake
TODO:
- Scons is still missing LAPACK lib define
- Do other platforms got LAPACK lib?
2012-05-15 11:35:01 +00:00
Antony Riakiotakis
ff06260ea1
Solve restriction of MinGW that users have to turn ffmpeg on for cmake.
2012-04-22 14:33:40 +00:00
Alexander Kuznetsov
4b9457dd4a
Patch is partially made by Pelle Johnsen. Thanks!
...
This patch enables search for specific libraries for vc2010 using "set_lib_path" macro
If *x* library or path exists in lib/win___/vc2010/*x* , vc2010 will use it. If not, compiler will use standard libraries.
It can be easily extended to gcc.
The function is enabled for:
openCollada
openExr
Python
openImageIO
The different libraries are needed for different compilers because C++ was used. There is no standard for lib's C++ structure/functions' names.
Actual libs will follow
2011-12-30 22:10:48 +00:00
Antony Riakiotakis
2a747e8b03
Fixes for MinGW cmake debug build:
...
* OpenEXR doesn't need debug suffix
* Fix libmv template issue when linking by removing duplicate libmv inclusion. I wonder how this never turned up in release builds as well.
Important: Since OpenImageIO went into trunk, OpenEXR, possibly along with other image libraries will need to be turned on too because OIIO depends on them.
2011-11-09 18:50:48 +00:00
Brecht Van Lommel
a6828b9c6f
CMake: add delayed_install macro to specify files to be installed from modules
...
other than source/creator.
2011-11-07 15:53:40 +00:00
Brecht Van Lommel
b06db617a0
CMake: Boost and OpenImageIO building support (unused still).
2011-11-07 15:44:09 +00:00
Campbell Barton
a5959e767e
hopefully fix problem with cmake on osx (older gcc version)
2011-11-01 00:34:09 +00:00
Campbell Barton
f708318833
correct flags for older GCC's which dont suppport -Wno-deprecated-declarations,
...
detect if the flag is supported before use
2011-10-30 04:48:00 +00:00
Campbell Barton
c936c61bac
tweak remove_strict_flags so it can be used with gcc's -Wall
2011-10-27 07:26:41 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Campbell Barton
da73642ed1
remove find samplerate module, use -msse2 flag for intel c++ since its supported.
2011-10-02 17:16:28 +00:00
Joerg Mueller
07ad83a439
* Removing libsamplerate from build systems
...
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
2011-10-02 17:09:39 +00:00
Campbell Barton
71f772a0ed
minor cmake edits:
...
- osx was defaulting to -O3.
- clang wasnt detecting sse compiler args.
2011-10-02 16:43:39 +00:00
Campbell Barton
077fd13416
cmake:
...
- fix for cmake's SSE detection which would fail because of strict warnings and also had redundant cache setting.
- was incorrectly initializing variables (own bad)
- python was searching for libs on every run, now only do this if there not cached.
2011-10-01 19:52:33 +00:00
Campbell Barton
622e8ee363
cmake: sse flags were being defined in 2 different places
2011-10-01 18:29:40 +00:00
Campbell Barton
7b9f3eac42
fix for odd linking error with ffmpeg.
2011-09-30 16:54:11 +00:00
Campbell Barton
7ef5464236
sse flags for intel c++ compiler
2011-09-30 16:37:46 +00:00
Campbell Barton
cf3956f450
formatting edits only
2011-09-30 15:51:58 +00:00
Campbell Barton
ca2528d551
removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here).
2011-09-30 15:21:10 +00:00
Dalai Felinto
2d91b6cda7
wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :)
...
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files
2011-09-26 06:29:58 +00:00
Campbell Barton
297f14a1d6
fix for error linking opencollada on linux.
2011-09-12 13:58:13 +00:00
Campbell Barton
47ffe63c86
remove -Wundef for code we don't maintain & generated code.
2011-09-06 13:00:46 +00:00
Campbell Barton
817273931a
buildinfo is now quoted from the build systems, avoids stripping quotes on startup.
...
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +00:00
Campbell Barton
349c838996
add missing header to cmake files (else some IDE's wont index it)
2011-08-08 05:43:04 +00:00
Campbell Barton
baa37b1b46
more cmake/x11 edits
...
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486
NDOF related edits
...
- fix for building without NDOF on X11
- quiet some warnings
2011-08-02 05:52:27 +00:00
Mike Erwin
6cd4716d1a
enable CMake builds with spacenav (contributed by Kevin Cozens)
2011-07-21 21:34:28 +00:00
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
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
Campbell Barton
418bce9341
fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug
2011-06-25 14:10:46 +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
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
82216030e9
py-api: store frequently used strings as unicode PyObject's to avoid creating/distroying every time.
...
also fix for cmake warning
2011-06-18 08:45:45 +00:00
Campbell Barton
04c5f054d8
error in recent commit
2011-06-15 14:00:50 +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
bb6e0834e0
cmake: combine debug/optimized into one target_link_libraries() call.
2011-06-15 13:42:02 +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
c2e1f3a1e2
fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes.
...
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
2011-06-11 06:00:28 +00:00
Campbell Barton
09da9d4393
cmake maintenance
...
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Campbell Barton
20ae95422e
include ffmpeg_compat header in cmake source list.
2011-05-28 04:53:17 +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