Skip to content

Commit 19dde2f

Browse files
authored
fix runtime libs (#8924)
1 parent d17ec15 commit 19dde2f

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

CMakeLists.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ option(VCPKG_USE_OPENCV2 "Use legacy OpenCV 2" OFF)
2222
option(VCPKG_USE_OPENCV3 "Use legacy OpenCV 3" OFF)
2323
option(VCPKG_USE_OPENCV4 "Use OpenCV 4" ON)
2424
option(USE_NSIS "Use NSIS as a CPack backend on Windows" ON)
25+
option(SKIP_INSTALL_RUNTIME_LIBS "Do not install runtime libs" OFF)
2526

2627
if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET})
2728
message(STATUS "Setting default vcpkg target triplet to $ENV{VCPKG_DEFAULT_TRIPLET}")
@@ -67,11 +68,7 @@ if(ENABLE_OPENCV)
6768
endif()
6869
endif()
6970

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")
7572
set(IS_X86 TRUE)
7673
else()
7774
set(IS_X86 FALSE)
@@ -672,13 +669,14 @@ if(ENABLE_CSHARP_WRAPPER)
672669
add_subdirectory(src/csharp)
673670
endif()
674671

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(
679676
PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
680677
DESTINATION ${INSTALL_BIN_DIR}
681-
)
678+
)
679+
endif()
682680

683681
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json)
684682
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json VCPKG_JSON_STRING)

0 commit comments

Comments
 (0)