@@ -22,6 +22,7 @@ option(VCPKG_USE_OPENCV2 "Use legacy OpenCV 2" OFF)
22
22
option (VCPKG_USE_OPENCV3 "Use legacy OpenCV 3" OFF )
23
23
option (VCPKG_USE_OPENCV4 "Use OpenCV 4" ON )
24
24
option (USE_NSIS "Use NSIS as a CPack backend on Windows" ON )
25
+ option (SKIP_INSTALL_RUNTIME_LIBS "Do not install runtime libs" OFF )
25
26
26
27
if (DEFINED ENV{VCPKG_DEFAULT_TRIPLET})
27
28
message (STATUS "Setting default vcpkg target triplet to $ENV{VCPKG_DEFAULT_TRIPLET} " )
@@ -67,11 +68,7 @@ if(ENABLE_OPENCV)
67
68
endif ()
68
69
endif ()
69
70
70
- if (NOT CMAKE_HOST_SYSTEM_PROCESSOR AND NOT WIN32 )
71
- execute_process (COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE)
72
- endif ()
73
-
74
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86" )
71
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^AMD64" )
75
72
set (IS_X86 TRUE )
76
73
else ()
77
74
set (IS_X86 FALSE )
@@ -672,13 +669,14 @@ if(ENABLE_CSHARP_WRAPPER)
672
669
add_subdirectory (src/csharp)
673
670
endif ()
674
671
675
- set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE )
676
- include (InstallRequiredSystemLibraries )
677
-
678
- install (
672
+ if ( NOT SKIP_INSTALL_RUNTIME_LIBS )
673
+ set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE )
674
+ include (InstallRequiredSystemLibraries)
675
+ install (
679
676
PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
680
677
DESTINATION ${INSTALL_BIN_DIR}
681
- )
678
+ )
679
+ endif ()
682
680
683
681
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /vcpkg.json)
684
682
file (READ ${CMAKE_CURRENT_SOURCE_DIR} /vcpkg.json VCPKG_JSON_STRING)
0 commit comments