From f3081f3930973a43c8fc0750df941e5f7ae4edc6 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 10 Feb 2025 12:50:46 -0600 Subject: [PATCH] updated build system --- CMakeLists.txt | 5 +++++ cmake/versions.cmake | 12 ++++++------ scripts/make_common.sh | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd48d67d..ec98d7be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.27) cmake_policy(SET CMP0135 NEW) cmake_policy(SET CMP0144 NEW) +if (NOT PROJECT_INTERFACE) + message(FATAL_ERROR "Project must be compiled via 'make_win32.cmd'/'make_win32.sh' or 'make_unix.sh' build scripts. Invoking 'cmake' directly is not supported.") +endif() + project(${PROJECT_NAME} DESCRIPTION ${PROJECT_DESC} HOMEPAGE_URL ${PROJECT_URL} @@ -158,6 +162,7 @@ endif() -DPROJECT_FUSE=${PROJECT_FUSE} -DPROJECT_FUSE_INCLUDE_DIRS=${PROJECT_FUSE_INCLUDE_DIRS} -DPROJECT_GIT_REV=${PROJECT_GIT_REV} + -DPROJECT_INTERFACE=1 -DPROJECT_IS_ALPINE=${PROJECT_IS_ALPINE} -DPROJECT_IS_ARM64=${PROJECT_IS_ARM64} -DPROJECT_IS_MINGW=${PROJECT_IS_MINGW} diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 2a121d97..4eddf7f5 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,15 +1,15 @@ set(BINUTILS_VERSION 2.43) -set(BOOST2_MAJOR_VERSION 1) -set(BOOST2_MINOR_VERSION 76) -set(BOOST2_PATCH_VERSION 0) set(BOOST_MAJOR_VERSION 1) set(BOOST_MINOR_VERSION 87) set(BOOST_PATCH_VERSION 0) +set(BOOST2_MAJOR_VERSION 1) +set(BOOST2_MINOR_VERSION 76) +set(BOOST2_PATCH_VERSION 0) set(CPP_HTTPLIB_VERSION 0.18.1) -set(CURL2_VERSION 8_11_0) set(CURL_VERSION 8.11.0) -set(EXPAT2_VERSION 2_6_4) +set(CURL2_VERSION 8_11_0) set(EXPAT_VERSION 2.6.4) +set(EXPAT2_VERSION 2_6_4) set(GCC_VERSION 14.2.0) set(GTEST_VERSION 1.15.2) set(ICU_VERSION 76-1) @@ -22,7 +22,7 @@ set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.14) set(ROCKSDB_VERSION 9.7.4) set(SPDLOG_VERSION 1.15.0) -set(SQLITE2_VERSION 3.46.1) set(SQLITE_VERSION 3460100) +set(SQLITE2_VERSION 3.46.1) set(STDUUID_VERSION 1.2.3) set(ZLIB_VERSION 1.3.1) diff --git a/scripts/make_common.sh b/scripts/make_common.sh index 1ae6b863..2d432ea0 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -23,6 +23,7 @@ cmake "${PROJECT_SOURCE_DIR}" \ -DPROJECT_COMPANY_NAME="${PROJECT_COMPANY_NAME}" \ -DPROJECT_COPYRIGHT="${PROJECT_COPYRIGHT}" \ -DPROJECT_DESC="${PROJECT_DESC}" \ + -DPROJECT_INTERFACE=1 \ -DPROJECT_URL="${PROJECT_URL}" \ ${PROJECT_CMAKE_OPTS} || exit 1