diff --git a/cmake-init/templates/common/cmake/docs-ci.cmake b/cmake-init/templates/common/cmake/docs-ci.cmake index 5a58464..26fa714 100644 --- a/cmake-init/templates/common/cmake/docs-ci.cmake +++ b/cmake-init/templates/common/cmake/docs-ci.cmake @@ -12,26 +12,29 @@ set(src "${PROJECT_SOURCE_DIR}") set(mcss_SOURCE_DIR "${bin}/docs/.ci") if(NOT IS_DIRECTORY "${mcss_SOURCE_DIR}") - file(MAKE_DIRECTORY "${mcss_SOURCE_DIR}") + file(MAKE_DIRECTORY "${mcss_SOURCE_DIR}_") file( DOWNLOAD - https://github.com/friendlyanon/m.css/releases/download/release-1/mcss.zip - "${mcss_SOURCE_DIR}/mcss.zip" + https://github.com/mosra/m.css/archive/4a1324c22ebaf81d68e8745610b0127288358b8c.zip + "${bin}/mcss.zip" STATUS status - EXPECTED_MD5 00cd2757ebafb9bcba7f5d399b3bec7f + EXPECTED_MD5 e1b1d45b861b718299eeb91f8badfc6f ) if(NOT status MATCHES "^0;") message(FATAL_ERROR "Download failed with ${status}") endif() execute_process( - COMMAND "${CMAKE_COMMAND}" -E tar xf mcss.zip - WORKING_DIRECTORY "${mcss_SOURCE_DIR}" + COMMAND "${CMAKE_COMMAND}" -E tar xf "${bin}/mcss.zip" + WORKING_DIRECTORY "${mcss_SOURCE_DIR}_" RESULT_VARIABLE result ) if(NOT result EQUAL "0") message(FATAL_ERROR "Extraction failed with ${result}") endif() - file(REMOVE "${mcss_SOURCE_DIR}/mcss.zip") + file(REMOVE "${bin}/mcss.zip") + file(GLOB dir LIST_DIRECTORIES ON "${mcss_SOURCE_DIR}_/*") + file(RENAME "${dir}" "${mcss_SOURCE_DIR}") + file(REMOVE "${mcss_SOURCE_DIR}_") endif() find_program(Python3_EXECUTABLE NAMES python3 python)