[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42309] trunk/blender/extern/libmv: Fix #29469: Latest motion tracking not working.

[Sergey Sharybin]

Revision: 42309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42309
Author:   nazgul
Date:     2011-12-01 10:25:16 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Fix #29469: Latest motion tracking not working.

It was error in CMakeLists.txt caused by automatic bundling script which
expanded variables instead of substituting them as-is.

Fixed both of bundling script and CMakeLists.txt

Modified Paths:
--------------
    trunk/blender/extern/libmv/CMakeLists.txt
    trunk/blender/extern/libmv/bundle.sh

Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt	2011-12-01 09:49:27 UTC (rev 42308)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2011-12-01 10:25:16 UTC (rev 42309)
@@ -175,9 +175,9 @@
 
 	if(MSVC)
 		set(MSVC_OFLAGS O1 O2 Ox)
-		foreach(FLAG )
-			string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
-			string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
+		foreach(FLAG ${MSVC_OFLAGS})
+			string(REPLACE "${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+			string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 		endforeach()
 	endif()
 else(WIN32)

Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh	2011-12-01 09:49:27 UTC (rev 42308)
+++ trunk/blender/extern/libmv/bundle.sh	2011-12-01 10:25:16 UTC (rev 42309)
@@ -183,9 +183,9 @@
 
 	IF(MSVC)
 		set(MSVC_OFLAGS O1 O2 Ox)
-		foreach(FLAG ${MSVC_OFLAGS})
-			string(REPLACE "${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-			string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+		foreach(FLAG \${MSVC_OFLAGS})
+			string(REPLACE "\${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "\${CMAKE_CXX_FLAGS_RELEASE}")
+			string(REPLACE "\${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "\${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 		endforeach()
 	ENDIF(MSVC)
 ELSE(WIN32)