From 0f2c507c309162e32992ab3982dc7221b4674f9e Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 7 Jun 2024 16:09:46 -0500 Subject: [PATCH] fix --- CMakeLists.txt | 1 + project.cmake | 5 +++++ scripts/env.sh | 1 + 3 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 738aa134..e91b4e15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ endif() -DPROJECT_BUILD_DIR=${PROJECT_BUILD_DIR} -DPROJECT_BUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} -DPROJECT_CMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE} + -DPROJECT_DIST_DIR=${PROJECT_DIST_DIR} -DPROJECT_ENABLE_WXWIDGETS=${PROJECT_ENABLE_WXWIDGETS} -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP} -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS} diff --git a/project.cmake b/project.cmake index 6016a8f4..435ae3b1 100644 --- a/project.cmake +++ b/project.cmake @@ -29,3 +29,8 @@ 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/env.sh b/scripts/env.sh index 2f67b940..2cfbe4aa 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -202,6 +202,7 @@ PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_ARCH=${PROJECT_BUILD_ARCH} ${PROJECT_CMAKE_O PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_DIR=${PROJECT_BUILD_DIR} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_CMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE} ${PROJECT_CMAKE_OPTS}" +PROJECT_CMAKE_OPTS="-DPROJECT_DIST_DIR=${PROJECT_DIST_DIR} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_IS_ALPINE=${PROJECT_IS_ALPINE} ${PROJECT_CMAKE_OPTS}" PROJECT_CMAKE_OPTS="-DPROJECT_IS_ARM64=${PROJECT_IS_ARM64} ${PROJECT_CMAKE_OPTS}"