Skip to content

Commit a3c8738

Browse files
Michel MLMichel ML
Michel ML
authored and
Michel ML
committed
wip
1 parent 1fea2ca commit a3c8738

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

Dockerfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ RUN wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_DOT_VERSI
5656
tar xzf boost_${BOOST_UNDERSCORE_VERSION}.tar.gz && \
5757
mv boost_${BOOST_UNDERSCORE_VERSION} /opt/boost && \
5858
cd /opt/boost && \
59-
# Create the include directory structure that CMake expects
60-
mkdir -p /usr/local/include && \
61-
cp -r boost /usr/local/include/
59+
./bootstrap.sh && \
60+
./b2 headers
6261

6362
# Set environment variables for Boost
6463
ENV BOOST_ROOT=/opt/boost
65-
ENV BOOST_INCLUDEDIR=/usr/local/include
66-
ENV CMAKE_PREFIX_PATH=/opt/boost:/usr/local
64+
ENV Boost_INCLUDE_DIR=/opt/boost
65+
ENV CMAKE_PREFIX_PATH=/opt/boost
6766

6867

6968
WORKDIR /opt
@@ -84,18 +83,21 @@ RUN git fetch --all --tags && \
8483
git checkout ${RDKIT_BRANCH}
8584

8685
RUN mkdir build
86+
# Create a minimal FindBoost.cmake
87+
RUN mkdir -p /opt/cmake/Modules && \
88+
echo 'set(Boost_FOUND TRUE)' > /opt/cmake/Modules/FindBoost.cmake && \
89+
echo 'set(Boost_INCLUDE_DIRS ${BOOST_ROOT})' >> /opt/cmake/Modules/FindBoost.cmake && \
90+
echo 'set(Boost_VERSION ${Boost_FIND_VERSION})' >> /opt/cmake/Modules/FindBoost.cmake
91+
8792
WORKDIR $RDBASE/build
8893
RUN echo "source /opt/emsdk/emsdk_env.sh > /dev/null 2>&1" >> ~/.bashrc
8994
SHELL ["/bin/bash", "-c", "-l"]
9095
RUN emcmake cmake \
91-
-DBoost_DEBUG=ON \
92-
-DBoost_VERBOSE=ON \
93-
-DBoost_NO_BOOST_CMAKE=ON \
96+
-DCMAKE_MODULE_PATH=/opt/cmake/Modules \
9497
-DBoost_NO_SYSTEM_PATHS=ON \
98+
-DBoost_NO_BOOST_CMAKE=ON \
9599
-DBOOST_ROOT=/opt/boost \
96-
-DBOOST_INCLUDEDIR=/usr/local/include \
97-
-DBoost_INCLUDE_DIR=/usr/local/include \
98-
-DCMAKE_MODULE_PATH=/opt/boost \
100+
-DBoost_INCLUDE_DIR=/opt/boost \
99101
-DRDK_BUILD_FREETYPE_SUPPORT=ON \
100102
-DRDK_BUILD_MINIMAL_LIB=ON \
101103
-DRDK_BUILD_PYTHON_WRAPPERS=OFF \

0 commit comments

Comments
 (0)