diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dd0340..ea05413 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.30) -project(base VERSION 1.0.1) +project(base VERSION 1.0.2) set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/docker/shared.dockerfile b/docker/shared.dockerfile index a3d71c7..18c4742 100644 --- a/docker/shared.dockerfile +++ b/docker/shared.dockerfile @@ -2,7 +2,7 @@ ARG BOOST_VERSION="1.89.0" ARG BOOST_VARIANT="release" ARG LINK="shared" -FROM ghcr.io/morphgrid/framework:1.0.0-boost-${BOOST_VERSION}-${BOOST_VARIANT}-${LINK} +FROM ghcr.io/morphgrid/framework:1.0.2-boost-${BOOST_VERSION}-${BOOST_VARIANT}-${LINK} ARG BOOST_VERSION ARG BOOST_VARIANT diff --git a/docker/static.dockerfile b/docker/static.dockerfile index ab25d93..1128207 100644 --- a/docker/static.dockerfile +++ b/docker/static.dockerfile @@ -2,7 +2,7 @@ ARG BOOST_VERSION="1.89.0" ARG BOOST_VARIANT="release" ARG LINK="shared" -FROM ghcr.io/morphgrid/framework:1.0.0-boost-${BOOST_VERSION}-${BOOST_VARIANT}-${LINK} AS builder +FROM ghcr.io/morphgrid/framework:1.0.2-boost-${BOOST_VERSION}-${BOOST_VARIANT}-${LINK} AS builder ARG BOOST_VERSION ARG BOOST_VARIANT diff --git a/scripts/build.sh b/scripts/build.sh index 11a05fd..7c685c3 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -12,6 +12,12 @@ ENABLE_STATIC="ON" else ENABLE_STATIC="OFF" fi -cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_PROGRAM_TESTS=OFF -DENABLE_CI=ON -DENABLE_STATIC_LINKING=$ENABLE_STATIC + +if [[ "$BUILD_TYPE" == "debug" ]]; then +DEBUG_ENABLED="ON" +else +DEBUG_ENABLED="OFF" +fi +cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_PROGRAM_TESTS=OFF -DENABLE_CI=ON -DDEBUG_ENABLED=$DEBUG_ENABLED -DENABLE_STATIC_LINKING=$ENABLE_STATIC make -j4 \ No newline at end of file