Skip to content

Commit b9d5603

Browse files
committed
Hide extraction and Packages clone for CI.
1 parent 125a318 commit b9d5603

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
@@ -2540,7 +2540,7 @@ if (APPLE)
25402540
"${RESOURCES_PATH}"
25412541
"$<TARGET_FILE_DIR:SerialPrograms>/../Resources"
25422542
)
2543-
elseif (WIN32)
2543+
elseif (WIN32 AND DEPLOY_FILES)
25442544
# Set directories and file dependencies (we HAVE to depend on a file for build-time extraction/git clone to work)
25452545
set(OPENCV_DEBUG_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.zip")
25462546
set(OPENCV_DEBUG "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.dll")
@@ -2901,9 +2901,24 @@ endif()
29012901
if (WIN32 AND NOT DEPLOY_FILES)
29022902
file(GLOB MY_DLLS
29032903
"../3rdPartyBinaries/*.dll"
2904-
)
2904+
)
2905+
file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
2906+
2907+
message(STATUS "Extracting opencv_world4110d")
2908+
file(ARCHIVE_EXTRACT
2909+
INPUT ${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4110d.zip
2910+
DESTINATION ${REPO_ROOT_DIR}/3rdPartyBinaries/
2911+
)
29052912

2906-
file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
2913+
set(DISCORD_SDK_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win.zip")
2914+
set(DISCORD_SDK_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win")
2915+
if(EXISTS "${DISCORD_SDK_ZIP}" AND NOT EXISTS "${DISCORD_SDK_DIR}")
2916+
message(STATUS "Extracting Social SDK")
2917+
file(ARCHIVE_EXTRACT
2918+
INPUT "${DISCORD_SDK_ZIP}"
2919+
DESTINATION "${REPO_ROOT_DIR}/3rdPartyBinaries"
2920+
)
2921+
endif()
29072922
endif()
29082923

29092924
if (WIN32 AND DEPLOY_FILES)

0 commit comments

Comments
 (0)