diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-01-03 19:35:46 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-01-03 19:35:46 +0400 |
| commit | e0869db01f21447fc6573dd88357da454b9d8a78 (patch) | |
| tree | 907233665910d67f9bcbedf7510c9a94ac8b3170 /build_files/cmake/Modules/FindOpenCOLLADA.cmake | |
| parent | 2ce08bb2d4fa3838eb7fc1c987c4576e420dec9d (diff) | |
Patch from Ejner Fergo: enhancements to install_deps.sh.
Mostly, it:
* Adds numpy and opencollada
* Merges both Suse and Fedora/Redhat into a single func (not sure this is a good idea, but would have been to painful to undo this).
Notes:
* I changed a bit how numpy is handled, so that the script does not try to build it when py3.3 was installed from package!
* Bumped oiio 'magic number', as now trying to use libtiff5 means we have to rebuild everything using tiff!
* Only made a quick test on my own system, but Ejner made quite some extensive ones, so it should be safe.
* I’m not sure keeping on extending that horrible bash thing is a good idea. Shell scripts are nice for small, limited stuff, but I personnaly find that one (over 53ko!) unreadable and a pita to maintain. Further more, doing the same for windows would mean to rewrite everything in another language... I have started work to port this as a py3 script, so that we have a nice structure (classes...) easy to extend/tweak/implement in various OSs/etc.!
Diffstat (limited to 'build_files/cmake/Modules/FindOpenCOLLADA.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 169d3a82fc7..84aead58b60 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -66,6 +66,7 @@ SET(_opencollada_SEARCH_DIRS /sw # Fink /opt/local # DarwinPorts /opt/csw # Blastwave + /opt/lib/opencollada ) SET(_opencollada_INCLUDES) |