[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41687] trunk/blender: Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked.

[Campbell Barton]

Since my commit removed "BOOST" define for linux, just a note that you
can use boosts find module search path, eg:

  cmake -DBOOST_ROOT=/opt/boost .

On Wed, Nov 9, 2011 at 8:40 AM, Brecht Van Lommel
<brechtvanlommel at pandora.be> wrote:
> Revision: 41687
>          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41687
> Author:   blendix
> Date:     2011-11-08 21:40:08 +0000 (Tue, 08 Nov 2011)
> Log Message:
> -----------
> Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked.
>
> Modified Paths:
> --------------
>    trunk/blender/CMakeLists.txt
>    trunk/blender/intern/cycles/CMakeLists.txt
>
> Modified: trunk/blender/CMakeLists.txt
> ===================================================================
> --- trunk/blender/CMakeLists.txt        2011-11-08 21:24:32 UTC (rev 41686)
> +++ trunk/blender/CMakeLists.txt        2011-11-08 21:40:08 UTC (rev 41687)
> @@ -503,19 +503,12 @@
>
>        if(WITH_BOOST)
>
> -               # not sure this is needed, commenting, campbell
> -               # ---
> -               # set(BOOST "/usr" CACHE PATH "Boost Directory")
> -               #
> -               # if(NOT BOOST_CUSTOM)
> -               #       set(BOOST_ROOT ${BOOST})
> -               #       set(Boost_USE_MULTITHREADED ON)
> -               #       find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
> -               # endif()
> +               # uses in build instructions to override include and library variables
> +               if(NOT BOOST_CUSTOM)
> +                       set(Boost_USE_MULTITHREADED ON)
> +                       find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
> +               endif()
>
> -               set(Boost_USE_MULTITHREADED ON)
> -               find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
> -
>                set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
>                set(BOOST_LIBRARIES ${Boost_LIBRARIES})
>                set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
>
> Modified: trunk/blender/intern/cycles/CMakeLists.txt
> ===================================================================
> --- trunk/blender/intern/cycles/CMakeLists.txt  2011-11-08 21:24:32 UTC (rev 41686)
> +++ trunk/blender/intern/cycles/CMakeLists.txt  2011-11-08 21:40:08 UTC (rev 41687)
> @@ -8,11 +8,10 @@
>
>  # Build Flags
>
> -set(GCC_WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-long-long")
>  set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3 -mtune=native")
>
>  if(APPLE)
> -       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
> +       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
>        set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
>  endif()
>
> @@ -21,13 +20,13 @@
>                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
>                set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
>        elseif(CMAKE_COMPILER_IS_GNUCC)
> -               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
> +               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
>                set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
>        endif()
>  endif()
>
>  if(UNIX AND NOT APPLE)
> -       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
> +       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
>        set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
>  endif()
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>



-- 
- Campbell