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
This commit is contained in:
6
extern/libmv/CMakeLists.txt
vendored
6
extern/libmv/CMakeLists.txt
vendored
@@ -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)
|
||||
|
6
extern/libmv/bundle.sh
vendored
6
extern/libmv/bundle.sh
vendored
@@ -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)
|
||||
|
Reference in New Issue
Block a user