diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-01 14:25:16 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-01 14:25:16 +0400 |
commit | c74f6a51b66485eb2158ad1efc79be1eca5c5949 (patch) | |
tree | 5b88aa4aa4be66bd148278f97cee51aae5df8353 /extern/libmv | |
parent | b6021462a8855a2ae1ecd03f61014060c3702888 (diff) |
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
Diffstat (limited to 'extern/libmv')
-rw-r--r-- | extern/libmv/CMakeLists.txt | 6 | ||||
-rwxr-xr-x | extern/libmv/bundle.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 6f0d5f3d126..0349ad72000 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -175,9 +175,9 @@ if(WIN32) 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) diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 690f78df387..fb336c66d61 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -183,9 +183,9 @@ IF(WIN32) 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) |