Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker/shared.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/static.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading