Revision: 37781
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37781
Author: xiaoxiangquan
Date: 2011-06-24 03:30:50 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
merge from trunk #37722
Modified Paths:
--------------
branches/soc-2011-garlic/CMakeLists.txt
branches/soc-2011-garlic/build_files/buildbot/master.cfg
branches/soc-2011-garlic/build_files/buildbot/master_unpack.py
branches/soc-2011-garlic/build_files/buildbot/slave_pack.py
branches/soc-2011-garlic/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-garlic/build_files/cmake/macros.cmake
branches/soc-2011-garlic/build_files/scons/config/linux2-config.py
branches/soc-2011-garlic/build_files/scons/config/win32-vc-config.py
branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py
branches/soc-2011-garlic/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2011-garlic/doc/blender_file_format/BlendFileReader.py
branches/soc-2011-garlic/doc/doxygen/Doxyfile
branches/soc-2011-garlic/doc/python_api/blender-org/layout.html
branches/soc-2011-garlic/doc/python_api/rst/bge.logic.rst
branches/soc-2011-garlic/doc/python_api/rst/bge.types.rst
branches/soc-2011-garlic/extern/bullet2/CMakeLists.txt
branches/soc-2011-garlic/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-garlic/intern/audaspace/CMakeLists.txt
branches/soc-2011-garlic/intern/elbeem/extern/elbeem.h
branches/soc-2011-garlic/intern/elbeem/intern/simulation_object.cpp
branches/soc-2011-garlic/intern/elbeem/intern/solver_class.h
branches/soc-2011-garlic/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-garlic/intern/elbeem/intern/solver_interface.h
branches/soc-2011-garlic/intern/smoke/CMakeLists.txt
branches/soc-2011-garlic/release/datafiles/splash.png
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_types.py
branches/soc-2011-garlic/release/scripts/modules/console/intellisense.py
branches/soc-2011-garlic/release/scripts/modules/rna_prop_ui.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-garlic/release/text/GPL-license.txt
branches/soc-2011-garlic/release/text/readme.html
branches/soc-2011-garlic/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-garlic/source/blender/blenkernel/BKE_action.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-garlic/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenkernel/depsgraph_private.h
branches/soc-2011-garlic/source/blender/blenkernel/intern/action.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/anim.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/armature.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/displist.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/node.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/object.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/sca.c
branches/soc-2011-garlic/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenloader/intern/readfile.c
branches/soc-2011-garlic/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenpluginapi/iff.h
branches/soc-2011-garlic/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-garlic/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-garlic/source/blender/collada/CMakeLists.txt
branches/soc-2011-garlic/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-garlic/source/blender/collada/DocumentImporter.h
branches/soc-2011-garlic/source/blender/collada/LightExporter.cpp
branches/soc-2011-garlic/source/blender/collada/MeshImporter.cpp
branches/soc-2011-garlic/source/blender/collada/SkinInfo.cpp
branches/soc-2011-garlic/source/blender/collada/collada_internal.cpp
branches/soc-2011-garlic/source/blender/editors/animation/anim_markers.c
branches/soc-2011-garlic/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-garlic/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-garlic/source/blender/editors/include/UI_interface.h
branches/soc-2011-garlic/source/blender/editors/interface/interface.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_layout.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_regions.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_templates.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-garlic/source/blender/editors/interface/resources.c
branches/soc-2011-garlic/source/blender/editors/interface/view2d.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-garlic/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-garlic/source/blender/editors/object/object_add.c
branches/soc-2011-garlic/source/blender/editors/object/object_bake.c
branches/soc-2011-garlic/source/blender/editors/object/object_modifier.c
branches/soc-2011-garlic/source/blender/editors/object/object_relations.c
branches/soc-2011-garlic/source/blender/editors/object/object_transform.c
branches/soc-2011-garlic/source/blender/editors/physics/particle_edit.c
branches/soc-2011-garlic/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-garlic/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/render/render_internal.c
branches/soc-2011-garlic/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-garlic/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-garlic/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_console/console_draw.c
branches/soc-2011-garlic/source/blender/editors/space_console/console_ops.c
branches/soc-2011-garlic/source/blender/editors/space_file/file_draw.c
branches/soc-2011-garlic/source/blender/editors/space_file/file_ops.c
branches/soc-2011-garlic/source/blender/editors/space_file/filelist.c
branches/soc-2011-garlic/source/blender/editors/space_file/filesel.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_draw.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_intern.h
branches/soc-2011-garlic/source/blender/editors/space_node/space_node.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-garlic/source/blender/editors/transform/transform.h
branches/soc-2011-garlic/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_generics.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_snap.c
branches/soc-2011-garlic/source/blender/editors/util/ed_util.c
branches/soc-2011-garlic/source/blender/editors/util/undo.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-garlic/source/blender/gpu/GPU_draw.h
branches/soc-2011-garlic/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-garlic/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-garlic/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-garlic/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-garlic/source/blender/imbuf/intern/rectop.c
branches/soc-2011-garlic/source/blender/imbuf/intern/util.c
branches/soc-2011-garlic/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-garlic/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-garlic/source/blender/makesrna/RNA_access.h
branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-garlic/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-garlic/source/blender/python/generic/IDProp.c
branches/soc-2011-garlic/source/blender/python/generic/IDProp.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-garlic/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-garlic/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-garlic/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-garlic/source/blender/python/intern/bpy_interface.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_props.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_rna.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_util.c
branches/soc-2011-garlic/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-garlic/source/blender/render/CMakeLists.txt
branches/soc-2011-garlic/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-garlic/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2011-garlic/source/blender/render/intern/include/rayobject.h
branches/soc-2011-garlic/source/blender/render/intern/source/convertblender.c
branches/soc-2011-garlic/source/blender/render/intern/source/pipeline.c
branches/soc-2011-garlic/source/blender/render/intern/source/rayshade.c
branches/soc-2011-garlic/source/blender/render/intern/source/render_texture.c
branches/soc-2011-garlic/source/blender/render/intern/source/rendercore.c
branches/soc-2011-garlic/source/blender/render/intern/source/renderdatabase.c
branches/soc-2011-garlic/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-garlic/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-garlic/source/blender/render/intern/source/strand.c
branches/soc-2011-garlic/source/blender/render/intern/source/zbuf.c
branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-garlic/source/creator/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-garlic/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-garlic/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-garlic/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-garlic/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-garlic/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-garlic/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2011-garlic/build_files/cmake/Modules/FindFftw3.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindJack.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindJeMalloc.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindOpenEXR.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindOpenJPEG.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindSamplerate.cmake
branches/soc-2011-garlic/build_files/cmake/Modules/FindSndFile.cmake
branches/soc-2011-garlic/doc/python_api/examples/bpy.props.4.py
branches/soc-2011-garlic/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_intern_string.h
Removed Paths:
-------------
branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake
Modified: branches/soc-2011-garlic/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/CMakeLists.txt 2011-06-24 00:55:14 UTC (rev
37780)
+++ branches/soc-2011-garlic/CMakeLists.txt 2011-06-24 03:30:50 UTC (rev
37781)
@@ -49,8 +49,13 @@
cmake_minimum_required(VERSION 2.8)
+if(NOT EXECUTABLE_OUTPUT_PATH)
+ set(FIRST_RUN "TRUE")
+endif()
+
+
# this starts out unset
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -223,9 +228,6 @@
set(WITH_HEADLESS ON)
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
-
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -234,6 +236,9 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE "")
+
# these are added to later on.
set(C_WARNINGS "")
set(CXX_WARNINGS "")
@@ -246,13 +251,12 @@
# On Unix:
# cmake ../blender \
# -D PYTHON_VERSION=3.2 \
-# -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \
-# -D PYTHON_LIBPATH=/opt/py32/lib \
-# -D PYTHON_LIBRARY=python3.2d
+# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
+# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
#
# On Macs:
# cmake ../blender \
-# -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2
\
+# -D
PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2
\
# -D
PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config
\
# -G Xcode
#
@@ -268,65 +272,48 @@
set(CMAKE_LIBRARY_PATH
"/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
endif()
- if(WITH_OPENAL)
- find_package(OpenAL)
- if(NOT OPENAL_FOUND)
- set(WITH_OPENAL OFF)
- endif()
- endif()
+ find_package(JPEG REQUIRED)
+ find_package(PNG REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(Freetype REQUIRED)
- if(WITH_JACK)
- set(JACK /usr)
- set(JACK_INC ${JACK}/include/jack)
- set(JACK_LIB jack)
- set(JACK_LIBPATH ${JACK}/lib)
- endif()
+ if(WITH_PYTHON)
+ # No way to set py32. remove for now.
+ # find_package(PythonLibs)
- if(WITH_CODEC_SNDFILE)
- set(SNDFILE /usr)
- set(SNDFILE_INC ${SNDFILE}/include)
- set(SNDFILE_LIB sndfile)
- set(SNDFILE_LIBPATH ${SNDFILE}/lib)
+ # Use our own instead, since wothout py is such a rare case,
+ # require this package
+ find_package(PythonLibsUnix REQUIRED)
endif()
- if(WITH_INTERNATIONAL)
- find_library(INTL_LIBRARY
- NAMES intl
- PATHS
- /sw/lib
- )
- find_library(ICONV_LIBRARY
- NAMES iconv
- PATHS
- /sw/lib
- )
- mark_as_advanced(ICONV_LIBRARY)
- mark_as_advanced(INTL_LIBRARY)
+ if(WITH_IMAGE_OPENEXR)
+ find_package(OpenEXR) # our own module
+ if(NOT OPENEXR_FOUND)
+ set(WITH_IMAGE_OPENEXR OFF)
+ endif()
+ endif()
- if(INTL_LIBRARY AND ICONV_LIBRARY)
- set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ if(WITH_IMAGE_OPENJPEG)
+ find_package(OpenJPEG)
+ if(NOT OPENJPEG_FOUND)
+ set(WITH_IMAGE_OPENJPEG OFF)
endif()
endif()
- find_package(Freetype)
- # unset(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+ if(WITH_IMAGE_TIFF)
+ find_package(TIFF)
+ if(NOT TIFF_FOUND)
+ set(WITH_IMAGE_TIFF OFF)
+ endif()
+ endif()
-
- if(WITH_PYTHON)
- # No way to set py32. remove for now.
- # find_package(PythonLibs)
-
- # defines...
-
- # PYTHON_VERSION
- # PYTHON_INCLUDE_DIRS
- # PYTHON_LIBRARY
- # PYTHON_LIBPATH
- # PYTHON_LINKFLAGS
-
- include(build_files/cmake/FindPythonLibsUnix.cmake)
-
+ # Audio IO
+ if(WITH_OPENAL)
+ find_package(OpenAL)
+ if(NOT OPENAL_FOUND)
+ set(WITH_OPENAL OFF)
+ endif()
endif()
if(WITH_SDL)
@@ -341,71 +328,71 @@
endif()
endif()
- if(WITH_IMAGE_OPENEXR)
- set(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
- mark_as_advanced(OPENEXR)
- find_path(OPENEXR_INC
- ImfXdr.h
- PATHS
- ${OPENEXR}/include/OpenEXR
- /usr/local/include/OpenEXR
- /sw/include/OpenEXR
- /opt/local/include/OpenEXR
- /opt/csw/include/OpenEXR
- /opt/include/OpenEXR
- )
- mark_as_advanced(OPENEXR_INC)
-
- set(OPENEXR_LIB Half IlmImf Iex Imath)
-
- if(NOT OPENEXR_INC)
- set(WITH_IMAGE_OPENEXR OFF)
+ if(WITH_JACK)
+ find_package(Jack)
+ if(NOT JACK_FOUND)
+ set(WITH_JACK OFF)
endif()
endif()
- if(WITH_IMAGE_TIFF)
- find_package(TIFF)
- if(NOT TIFF_FOUND)
- set(WITH_IMAGE_TIFF OFF)
+ # Codecs
+ if(WITH_CODEC_SNDFILE)
+ find_package(SndFile)
+ if(NOT SNDFILE_FOUND)
+ set(WITH_CODEC_SNDFILE OFF)
endif()
endif()
- find_package(JPEG REQUIRED)
-
- find_package(PNG REQUIRED)
-
- find_package(ZLIB REQUIRED)
-
if(WITH_CODEC_FFMPEG)
set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
- set(FFMPEG_INC ${FFMPEG}/include)
- set(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE
STRING "FFMPEG Libraries")
- mark_as_advanced(FFMPEG_LIB)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale
CACHE STRING "FFMPEG Libraries")
+ mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
-D__STDC_CONSTANT_MACROS")
endif()
+ if(WITH_INTERNATIONAL)
+ find_library(INTL_LIBRARY
+ NAMES intl
+ PATHS
+ /sw/lib
+ )
+
+ find_library(ICONV_LIBRARY
+ NAMES iconv
+ PATHS
+ /sw/lib
+ )
+ mark_as_advanced(ICONV_LIBRARY)
+ mark_as_advanced(INTL_LIBRARY)
+
+ if(INTL_LIBRARY AND ICONV_LIBRARY)
+ set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+ endif()
+ endif()
+
if(WITH_FFTW3)
- set(FFTW3 /usr)
- set(FFTW3_INC ${FFTW3}/include)
- set(FFTW3_LIB fftw3)
- set(FFTW3_LIBPATH ${FFTW3}/lib)
+ find_package(Fftw3)
+ if(NOT FFTW3_FOUND)
+ set(WITH_FFTW3 OFF)
+ endif()
endif()
if(WITH_SAMPLERATE)
- set(LIBSAMPLERATE /usr)
- set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- set(LIBSAMPLERATE_LIB samplerate)
- set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ find_package(Samplerate)
+ if(NOT SAMPLERATE_FOUND)
+ set(WITH_SAMPLERATE OFF)
+ endif()
endif()
if(WITH_OPENCOLLADA)
set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH
"OpenCollada Directory")
mark_as_advanced(OPENCOLLADA)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
- set(OPENCOLLADA_INC ${OPENCOLLADA})
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
+ set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
set(PCRE /usr CACHE FILEPATH "PCRE Directory")
mark_as_advanced(PCRE)
@@ -419,12 +406,10 @@
endif()
if(WITH_MEM_JEMALLOC)
- set(JEMALLOC /usr)
- set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
- set(JEMALLOC_LIBPATH ${JEMALLOC}/lib CACHE FILEPATH "JeMalloc
library path")
- # no use for this yet.
- # set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include CACHE FILEPATH
"JeMalloc include path")
- unset(JEMALLOC)
+ find_package(JeMalloc)
+ if(NOT JEMALLOC_FOUND)
+ set(WITH_MEM_JEMALLOC OFF)
+ endif()
endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using
--as-needed
@@ -446,10 +431,8 @@
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
list(APPEND LLIBS -ldl)
-
# binreloc is linux only
- set(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
- set(BINRELOC_INC ${BINRELOC}/include)
+ set(BINRELOC_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
endif()
endif()
@@ -502,16 +485,16 @@
if(WITH_INTERNATIONAL)
set(ICONV ${LIBDIR}/iconv)
- set(ICONV_INC ${ICONV}/include)
- set(ICONV_LIB iconv)
+ set(ICONV_INCLUDE_DIRS ${ICONV}/include)
+ set(ICONV_LIBRARIES iconv)
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
if(WITH_SAMPLERATE)
- set(LIBSAMPLERATE ${LIBDIR}/samplerate)
- set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- set(LIBSAMPLERATE_LIB libsamplerate)
- set(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ set(SAMPLERATE ${LIBDIR}/samplerate)
+ set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include)
+ set(SAMPLERATE_LIBRARIES libsamplerate)
+ set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
set(PNG "${LIBDIR}/png")
@@ -533,9 +516,9 @@
if(WITH_CODEC_SNDFILE)
set(SNDFILE ${LIBDIR}/sndfile)
- set(SNDFILE_INC ${SNDFILE}/include)
- set(SNDFILE_LIB libsndfile-1)
- set(SNDFILE_LIBPATH ${SNDFILE}/lib)
+ set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
+ set(SNDFILE_LIBRARIES libsndfile-1)
+ set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate
endif()
if(WITH_SDL)
@@ -547,8 +530,8 @@
if(WITH_CODEC_QUICKTIME)
set(QUICKTIME ${LIBDIR}/QTDevWin)
- set(QUICKTIME_INC ${QUICKTIME}/CIncludes)
- set(QUICKTIME_LIB qtmlClient)
+ set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes)
+ set(QUICKTIME_LIBRARIES qtmlClient)
set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
endif()
@@ -611,9 +594,9 @@
endif()
set(PTHREADS ${LIBDIR}/pthreads)
- set(PTHREADS_INC ${PTHREADS}/include)
+ set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
- set(PTHREADS_LIB pthreadVC2)
+ set(PTHREADS_LIBRARIES pthreadVC2)
set(FREETYPE ${LIBDIR}/freetype)
set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
@@ -622,31 +605,41 @@
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
- set(FFTW3_LIB libfftw)
- set(FFTW3_INC ${FFTW3}/include)
+ set(FFTW3_LIBRARIES libfftw)
+ set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA ${LIBDIR}/opencollada)
- set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver
GeneratedSaxParser xml2 buffer ftoa UTF)
- set(PCRE_LIB pcre)
+ set(OPENCOLLADA_INCLUDE_DIR
+ ${LIBDIR}/opencollada/include
+ )
+ set(OPENCOLLADA_LIBRARIES
+
${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
+
${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
