diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:13:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:13:12 +0400 |
| commit | 10af15b85b743a18215a1fc58799264b5c798403 (patch) | |
| tree | 5c93a43229f31a9befdd2582d3fe382390add2cf /build_files/cmake | |
| parent | 3c9d69744e0aca3ffe3ace103233679988769e91 (diff) | |
| parent | aba149189b7f0ee08765d2ef63a94080d02bdbf4 (diff) | |
Cycles: svn merge -r40934:41157 ^/trunk/blender
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindGLEW.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 5 | ||||
| -rw-r--r-- | build_files/cmake/RpmBuild.cmake | 27 | ||||
| -rw-r--r-- | build_files/cmake/cmake_consistency_check_config.py | 8 |
4 files changed, 30 insertions, 14 deletions
diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index c791327c8da..7e1b00d0923 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -51,9 +51,9 @@ ELSE (WIN32) ENDIF (WIN32) IF (GLEW_INCLUDE_PATH) - SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") + SET(GLEW_FOUND TRUE) ELSE (GLEW_INCLUDE_PATH) - SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") + SET(GLEW_FOUND FALSE) ENDIF (GLEW_INCLUDE_PATH) MARK_AS_ADVANCED( GLEW_FOUND ) diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 0c8d8c8d841..77c8b09c4ac 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -53,10 +53,11 @@ SET(_opencollada_FIND_COMPONENTS ) # Fedora openCOLLADA package links these statically +# note that order is important here ot it wont link SET(_opencollada_FIND_STATIC_COMPONENTS - UTF - ftoa buffer + ftoa + UTF ) SET(_opencollada_SEARCH_DIRS diff --git a/build_files/cmake/RpmBuild.cmake b/build_files/cmake/RpmBuild.cmake index 2c821a9dd7a..2fdd0a72932 100644 --- a/build_files/cmake/RpmBuild.cmake +++ b/build_files/cmake/RpmBuild.cmake @@ -3,17 +3,24 @@ # Authors: Rohit Yadav <rohityadav89@gmail.com> # -find_program(RPMBUILD - NAMES rpmbuild - PATHS "/usr/bin") +if(NOT DEFINED RPMBUILD) -mark_as_advanced(RPMBUILD) + find_program(RPMBUILD + NAMES rpmbuild + PATHS "/usr/bin") + + mark_as_advanced(RPMBUILD) + + if(RPMBUILD) + message(STATUS "RPM Build Found: ${RPMBUILD}") + else(RPMBUILD) + message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available") + endif() + +endif() if(RPMBUILD) - get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE) - message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}") - set(RPMBUILD_FOUND "YES") + set(RPMBUILD_FOUND TRUE) else(RPMBUILD) - message(STATUS "rpmbuild NOT found. RPM generation will not be available") - set(RPMBUILD_FOUND "NO") -endif() + set(RPMBUILD_FOUND FALSE) +endif()
\ No newline at end of file diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py index 60a46d3a1dd..86f51273ff5 100644 --- a/build_files/cmake/cmake_consistency_check_config.py +++ b/build_files/cmake/cmake_consistency_check_config.py @@ -27,6 +27,10 @@ IGNORE = ( "extern/eltopo/common/openglutils.cpp", "extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp", "source/blender/imbuf/intern/imbuf_cocoa.m", + "extern/recastnavigation/Recast/Source/RecastLog.cpp", + "extern/recastnavigation/Recast/Source/RecastTimer.cpp", + "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp", + "entern/audaspace/SRC/AUD_SRCResampleReader.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h", "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h", @@ -41,6 +45,10 @@ IGNORE = ( "extern/eltopo/common/meshes/TriangleIndex.hpp", "extern/eltopo/common/meshes/meshloader.h", "extern/eltopo/eltopo3d/broadphase_blenderbvh.h" + "extern/recastnavigation/Recast/Include/RecastLog.h", + "extern/recastnavigation/Recast/Include/RecastTimer.h", + "intern/audaspace/SRC/AUD_SRCResampleFactory.h", + "intern/audaspace/SRC/AUD_SRCResampleReader.h", ) UTF8_CHECK = True |