From c14b381061c36bf90a047a4488952b7a54da7682 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Sat, 11 Jan 2025 18:40:56 +0000 Subject: [PATCH] correct quote. --- CMakeLists.txt | 2 +- Dockerfiles/ubuntu2204.dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5058a5..d39104f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(Libraries_ROOT /opt/Libraries) set(Wt_DIR ${Libraries_ROOT}/wt-4.11.1/lib/cmake/wt) set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS) -set(nng_DIR ${Libraries_ROOT}/nng-1.9.0/lib/cmake/nng) +set(nng_DIR ${Libraries_ROOT}/nng-1.10/lib/cmake/nng) set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.3/lib/cmake/LibDataChannel) set(OPENSSL_LIBRARIES ssl crypto) diff --git a/Dockerfiles/ubuntu2204.dockerfile b/Dockerfiles/ubuntu2204.dockerfile index e0b5076..91898df 100644 --- a/Dockerfiles/ubuntu2204.dockerfile +++ b/Dockerfiles/ubuntu2204.dockerfile @@ -72,8 +72,8 @@ RUN cd /root \ && cmake --build . --parallel \ && ninja install \ && rm -fr /root/qt-everywhere-src-${QT_VERSION}* \ - && echo 'export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH' >> /etc/profile \ - && echo 'export LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH' >> /etc/profile + && echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH" >> /etc/profile \ + && echo "export LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH" >> /etc/profile ENV PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH ENV LD_LIBRARY_PATH=/opt/Qt/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH @@ -85,8 +85,8 @@ RUN cd /root \ && ./bootstrap.sh --prefix=/opt/Libraries/boost_${BOOST_VERSION} \ && ./b2 install -q --prefix=/opt/Libraries/boost_${BOOST_VERSION} threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC \ && rm -fr /root/boost_${BOOST_VERSION}* \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:LD_LIBRARY_PATH' >> /etc/profile -ENV LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:LD_LIBRARY_PATH + && echo "export LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:$LD_LIBRARY_PATH" >> /etc/profile +ENV LD_LIBRARY_PATH=/opt/Libraries/boost_${BOOST_VERSION}/lib:$LD_LIBRARY_PATH RUN cd /root \ && wget https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 \ @@ -132,7 +132,7 @@ RUN cd /root \ && cmake --build build --target all \ && cmake --install build \ && rm -fr /root/ZLMediaKit \ - && echo 'export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH' >> /etc/profile + && echo "export LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH" >> /etc/profile ENV LD_LIBRARY_PATH=/opt/Libraries/ZLMediaKit/lib:$LD_LIBRARY_PATH ENV LANG=C.UTF-8