svn merge ^/trunk/blender -r48370:48375
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 14:19:53 +0000 (14:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 14:19:53 +0000 (14:19 +0000)
1  2 
build_files/cmake/macros.cmake

index 564dbea2c82f8e15b0700a4e17365de5356ae786,3608f41e369e9b751351f0c6c5db95e5d8444a42..f34c88214a9487a3394a947c923721e064096aff
@@@ -193,9 -193,6 +193,9 @@@ macro(SETUP_LIBDIRS
        if(WITH_OPENIMAGEIO)
                link_directories(${OPENIMAGEIO_LIBPATH})
        endif()
 +      if(WITH_OPENCOLORIO)
 +              link_directories(${OPENCOLORIO_LIBPATH})
 +      endif()
        if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
                link_directories(${OPENJPEG_LIBPATH})
        endif()
@@@ -239,8 -236,7 +239,7 @@@ macro(setup_liblink
                        ${OPENGL_glu_LIBRARY}
                        ${PNG_LIBRARIES}
                        ${ZLIB_LIBRARIES}
-                       ${FREETYPE_LIBRARY}
-                       ${LAPACK_LIBRARIES})
+                       ${FREETYPE_LIBRARY})
  
        # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
        if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
        if(WITH_OPENIMAGEIO)
                target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
        endif()
 +      if(WITH_OPENCOLORIO)
 +              target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
 +      endif()
        if(WITH_BOOST)
                target_link_libraries(${target} ${BOOST_LIBRARIES})
        endif()
        if(WITH_INPUT_NDOF)
                target_link_libraries(${target} ${NDOF_LIBRARIES})
        endif()
+       if(WITH_MOD_CLOTH_ELTOPO)
+               target_link_libraries(${target} ${LAPACK_LIBRARIES})
+       endif()
        if(WIN32 AND NOT UNIX)
                target_link_libraries(${target} ${PTHREADS_LIBRARIES})
        endif()
@@@ -458,6 -453,12 +459,12 @@@ macro(remove_strict_flags
                add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
        endif()
  
+       if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+               remove_cc_flag("-Wunused-parameter")
+               remove_cc_flag("-Wunused-variable")
+               remove_cc_flag("-Werror")
+       endif()
        if(MSVC)
                # TODO
        endif()