[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54795] trunk/blender: Rename CMake' s Boost_USE_ICU to WITH_BOOST_ICU ( update your CMake conf if you make static builds!), and add it as CMake option.

[Bastien Montagne]

Revision: 54795
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54795
Author:   mont29
Date:     2013-02-23 20:42:15 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
Rename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make static builds!), and add it as CMake option.

Patch by gdh (Gavin Howard), many thanks!

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-02-23 20:24:02 UTC (rev 54794)
+++ trunk/blender/CMakeLists.txt	2013-02-23 20:42:15 UTC (rev 54795)
@@ -243,6 +243,10 @@
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 	option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
+	if(WITH_STATIC_LIBS)
+		option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF)
+		mark_as_advanced(WITH_BOOST_ICU)
+	endif()
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
@@ -683,7 +687,7 @@
 				list(APPEND __boost_packages locale)
 			endif()
 			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
-			if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
+			if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
 				find_package(IcuLinux)
 			endif()
 			mark_as_advanced(Boost_DIR)  # why doesnt boost do this?

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2013-02-23 20:24:02 UTC (rev 54794)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2013-02-23 20:42:15 UTC (rev 54795)
@@ -1970,7 +1970,7 @@
     INFO "  $_2"
     _buildargs="$_buildargs $_1 $_2"
   elif $ALL_STATIC; then
-    _1="-D Boost_USE_ICU=ON"
+    _1="-D WITH_BOOST_ICU=ON"
     INFO "  $_1"
     _buildargs="$_buildargs $_1"
   fi