[Bf-blender-cvs] [90a86fe] master: Fix T38684: cmake OS X build problem when changing deployment target.

Brecht Van Lommel noreply at git.blender.org
Tue Feb 18 19:41:04 CET 2014


Commit: 90a86fecee6074f2c782f6f7b9ad21fb01c25db7
Author: Brecht Van Lommel
Date:   Tue Feb 18 18:02:53 2014 +0100
https://developer.blender.org/rB90a86fecee6074f2c782f6f7b9ad21fb01c25db7

Fix T38684: cmake OS X build problem when changing deployment target.

Don't cache these variables as they are not cleared on such changes.

===================================================================

M	extern/libmv/third_party/ceres/CMakeLists.txt

===================================================================

diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
index 52e2246..7fd86b6 100644
--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -360,4 +360,7 @@ else()
 	endif()
 endif()
 
+unset(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE)
+unset(HAVE_STD_UNORDERED_MAP_HEADER)
+
 blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list