diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake index fe4967bd..00b60443 100644 --- a/cmake/libraries/curl.cmake +++ b/cmake/libraries/curl.cmake @@ -11,6 +11,11 @@ if(PROJECT_ENABLE_CURL) link_libraries( CURL::libcurl ) + + if (EXISTS ${PROJECT_DIST_DIR}/cacert.pem) + file(REMOVE ${PROJECT_DIST_DIR}/cacert.pem) + endif() + file(DOWNLOAD https://curl.haxx.se/ca/cacert.pem ${PROJECT_DIST_DIR}/cacert.pem) elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32) ExternalProject_Add(curl_project PREFIX external diff --git a/project.cmake b/project.cmake index 435ae3b1..6016a8f4 100644 --- a/project.cmake +++ b/project.cmake @@ -29,8 +29,3 @@ add_project_library(lib${PROJECT_NAME} "" "" "${PROJECT_ADDITIONAL_SOURCES}") add_project_executable(${PROJECT_NAME} lib${PROJECT_NAME} lib${PROJECT_NAME}) add_project_test_executable(${PROJECT_NAME}_test lib${PROJECT_NAME} lib${PROJECT_NAME}) - -if (EXISTS ${PROJECT_DIST_DIR}/cacert.pem) - file(REMOVE ${PROJECT_DIST_DIR}/cacert.pem) -endif() -file(DOWNLOAD https://curl.haxx.se/ca/cacert.pem ${PROJECT_DIST_DIR}/cacert.pem) diff --git a/scripts/make_common.sh b/scripts/make_common.sh index 63dd629d..abbcd17d 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -48,6 +48,9 @@ for APP in ${PROJECT_APP_LIST[@]}; do if [ "${PROJECT_BUILD_SHARED_LIBS}" == "ON" ]; then if [ "${PROJECT_IS_MINGW}" != "1" ]; then rm "${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}" + if [ "${PROJECT_ENABLE_CURL}" == "ON" ]; then + mv "${PROJECT_DIST_DIR}/cacert.pem" "${PROJECT_DIST_DIR}/bin/cacert.pem" + fi rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/" cat <>"${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}" #!/bin/sh