mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 04:47:51 +08:00
a03df3f433
* [realsense2] Update to v2.10.1 Update realsense2 port to librealsense v2.10.1. * [realsense2] Change HEAD to development Change HEAD to development. The latest branch of librealsense is "development". * [realsense2] Add option to support RGB image decode using AVX2 Add option to support RGB image decode using AVX2. This option will be deprecated in the later versions. * [realsense2] Add debug postfix Add debug postfix "_d".
68 lines
2.8 KiB
Diff
68 lines
2.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9425b92d..21232504 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -299,6 +299,8 @@ if(BUILD_EASYLOGGINGPP)
|
|
list(APPEND REALSENSE_HPP third-party/easyloggingpp/src/easylogging++.h)
|
|
endif()
|
|
|
|
+option(BUILD_WITH_STATIC_CRT "Build with static link CRT" ON)
|
|
+
|
|
if(WIN32)
|
|
source_group("Source Files\\Backend" FILES
|
|
src/win/win-helpers.cpp
|
|
@@ -484,15 +486,17 @@ if(WIN32)
|
|
src/proc/disparity-transform.h
|
|
)
|
|
|
|
- foreach(flag_var
|
|
- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
|
|
- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
|
- CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
|
- CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
|
- if(${flag_var} MATCHES "/MD")
|
|
- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
|
- endif(${flag_var} MATCHES "/MD")
|
|
- endforeach(flag_var)
|
|
+ if(BUILD_WITH_STATIC_CRT)
|
|
+ foreach(flag_var
|
|
+ CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
|
|
+ CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
|
+ CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
|
+ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
|
+ if(${flag_var} MATCHES "/MD")
|
|
+ string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
|
+ endif(${flag_var} MATCHES "/MD")
|
|
+ endforeach(flag_var)
|
|
+ endif()
|
|
else()
|
|
|
|
endif()
|
|
@@ -652,15 +656,17 @@ if (BUILD_WITH_TM2)
|
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
|
|
find_package(libtm REQUIRED)
|
|
|
|
- foreach(flag_var
|
|
- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
|
|
- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
|
- CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
|
- CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
|
- if(${flag_var} MATCHES "/MD")
|
|
- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
|
- endif(${flag_var} MATCHES "/MD")
|
|
- endforeach(flag_var)
|
|
+ if(BUILD_WITH_STATIC_CRT)
|
|
+ foreach(flag_var
|
|
+ CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
|
|
+ CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
|
+ CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
|
+ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
|
+ if(${flag_var} MATCHES "/MD")
|
|
+ string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
|
+ endif(${flag_var} MATCHES "/MD")
|
|
+ endforeach(flag_var)
|
|
+ endif()
|
|
|
|
list(APPEND REALSENSE_HPP
|
|
src/tm2/tm-context.h
|