Skip to content

Commit 7701052

Browse files
committed
Hide extraction and Packages clone for CI.
1 parent f828a8b commit 7701052

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

SerialPrograms/CMakeLists.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,7 @@ if (APPLE)
25642564
"${RESOURCES_PATH}"
25652565
"$<TARGET_FILE_DIR:SerialPrograms>/../Resources"
25662566
)
2567-
elseif (WIN32)
2567+
elseif (WIN32 AND DEPLOY_FILES)
25682568
# Set directories and file dependencies (we HAVE to depend on a file for build-time extraction/git clone to work)
25692569
set(OPENCV_DEBUG_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.zip")
25702570
set(OPENCV_DEBUG "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.dll")
@@ -2913,9 +2913,24 @@ endif()
29132913
if (WIN32 AND NOT DEPLOY_FILES)
29142914
file(GLOB MY_DLLS
29152915
"../3rdPartyBinaries/*.dll"
2916-
)
2916+
)
2917+
file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
2918+
2919+
message(STATUS "Extracting opencv_world4110d")
2920+
file(ARCHIVE_EXTRACT
2921+
INPUT ${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.zip
2922+
DESTINATION ${REPO_ROOT_DIR}/3rdPartyBinaries/
2923+
)
29172924

2918-
file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
2925+
set(DISCORD_SDK_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win.zip")
2926+
set(DISCORD_SDK_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win")
2927+
if(EXISTS "${DISCORD_SDK_ZIP}" AND NOT EXISTS "${DISCORD_SDK_DIR}")
2928+
message(STATUS "Extracting Social SDK")
2929+
file(ARCHIVE_EXTRACT
2930+
INPUT "${DISCORD_SDK_ZIP}"
2931+
DESTINATION "${REPO_ROOT_DIR}/3rdPartyBinaries"
2932+
)
2933+
endif()
29192934
endif()
29202935

29212936
if (WIN32 AND DEPLOY_FILES)

0 commit comments

Comments
 (0)