Merging r50522 through r50572 from trunk into soc-2011-tomato
[blender.git] / build_files / cmake / macros.cmake
index ffe9e2fb2d134133830aa28783bcf3a03bb023a2..ad5e3155368d0566d62f01c7039d142cea4787d7 100644 (file)
@@ -27,7 +27,10 @@ macro(list_insert_after
        list_id item_check item_add
        )
        set(_index)
-       list(FIND ${list_id} "${item_check}" _index)
+       list(FIND "${list_id}" "${item_check}" _index)
+       if("${_index}" MATCHES "-1")
+               message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
+       endif()
        math(EXPR _index "${_index} + 1")
        list(INSERT ${list_id} "${_index}" ${item_add})
        unset(_index)
@@ -37,7 +40,10 @@ macro(list_insert_before
        list_id item_check item_add
        )
        set(_index)
-       list(FIND ${list_id} "${item_check}" _index)
+       list(FIND "${list_id}" "${item_check}" _index)
+       if("${_index}" MATCHES "-1")
+               message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
+       endif()
        list(INSERT ${list_id} "${_index}" ${item_add})
        unset(_index)
 endmacro()
@@ -373,6 +379,9 @@ macro(setup_liblinks
        if(WITH_MOD_CLOTH_ELTOPO)
                target_link_libraries(${target} ${LAPACK_LIBRARIES})
        endif()
+       if(WITH_CYCLES_OSL)
+               target_link_libraries(${target} ${OSL_LIBRARIES})
+       endif()
        if(WIN32 AND NOT UNIX)
                target_link_libraries(${target} ${PTHREADS_LIBRARIES})
        endif()
@@ -644,7 +653,7 @@ macro(blender_project_hack_post)
        # --------------
        # MINGW HACK END
        if (_reset_standard_libraries)
-               # Must come after project(...)
+               # Must come after projecINCt(...)
                #
                # MINGW workaround for -ladvapi32 being included which surprisingly causes
                # string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
@@ -725,12 +734,51 @@ macro(set_lib_path
                lvar
                lproj)
 
-       
-       if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj})
-               set(${lvar} ${LIBDIR}/vc2010/${lproj})
+       if(MSVC10)
+               set(${lvar} ${LIBDIR}/${lproj}/vc2010)
        else()
                set(${lvar} ${LIBDIR}/${lproj})
        endif()
+endmacro()
+
+
+macro(data_to_c
+      file_from file_to
+      list_to_add)
+
+       list(APPEND ${list_to_add} ${file_to})
+
+       get_filename_component(_file_to_path ${file_to} PATH)
+
+       add_custom_command(
+               OUTPUT ${file_to}
+               COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+               COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+               DEPENDS ${file_from} datatoc)
+       unset(_file_to_path)
+endmacro()
+
+
+# same as above but generates the var name and output automatic.
+macro(data_to_c_simple
+      file_from
+      list_to_add)
+
+       # remove ../'s
+       get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}   REALPATH)
+       get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
+
+       list(APPEND ${list_to_add} ${_file_to})
+
+       get_filename_component(_file_to_path ${_file_to} PATH)
 
+       add_custom_command(
+               OUTPUT  ${_file_to}
+               COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+               COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
+               DEPENDS ${_file_from} datatoc)
 
+       unset(_file_from)
+       unset(_file_to)
+       unset(_file_to_path)
 endmacro()