support old cmake versions with finding boost
This commit is contained in:
parent
a342d78df7
commit
b19c92079d
|
@ -216,7 +216,11 @@ endif()
|
||||||
|
|
||||||
target_link_libraries(checks-parser PRIVATE -lcurl)
|
target_link_libraries(checks-parser PRIVATE -lcurl)
|
||||||
|
|
||||||
find_package(Boost 1.45.0 CONFIG REQUIRED COMPONENTS regex)
|
if (CMAKE_VERSION VERSION_LESS 3.30)
|
||||||
|
find_package(Boost 1.45.0 REQUIRED COMPONENTS regex)
|
||||||
|
else()
|
||||||
|
find_package(Boost 1.45.0 CONFIG REQUIRED COMPONENTS regex)
|
||||||
|
endif()
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
target_link_libraries(checks-parser PUBLIC ${Boost_LIBRARIES})
|
target_link_libraries(checks-parser PUBLIC ${Boost_LIBRARIES})
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,8 @@ COPY ./*.h ./*cpp ./*.ui ./*.qrc CMakeLists.txt .
|
||||||
RUN mkdir build
|
RUN mkdir build
|
||||||
WORKDIR /appimage/build
|
WORKDIR /appimage/build
|
||||||
|
|
||||||
|
RUN DEBIAN_FRONTEND=noninteractive apt install -y libboost-regex-dev
|
||||||
|
|
||||||
RUN cmake -DBUILD_TRANSLATIONS=on .. && make -j 8
|
RUN cmake -DBUILD_TRANSLATIONS=on .. && make -j 8
|
||||||
|
|
||||||
WORKDIR /appimage/AppDir/usr/bin
|
WORKDIR /appimage/AppDir/usr/bin
|
||||||
|
@ -73,5 +75,4 @@ WORKDIR /appimage
|
||||||
RUN PATH=/usr/lib/qt5/bin/:$PATH linuxdeployqt --appimage-extract-and-run AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage
|
RUN PATH=/usr/lib/qt5/bin/:$PATH linuxdeployqt --appimage-extract-and-run AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage
|
||||||
|
|
||||||
RUN mkdir -p /output
|
RUN mkdir -p /output
|
||||||
RUN cp Checks_parser-x86_64.AppImage /output
|
ENTRYPOINT ["cp", "Checks_parser-x86_64.AppImage", "/output"]
|
||||||
ENTRYPOINT bash
|
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
diff --git a/deploy/appimage/Dockerfile b/deploy/appimage/Dockerfile
|
||||||
|
index 48b9ef7..51290a0 100644
|
||||||
|
--- a/deploy/appimage/Dockerfile
|
||||||
|
+++ b/deploy/appimage/Dockerfile
|
||||||
|
@@ -62,6 +62,8 @@ COPY ./*.h ./*cpp ./*.ui ./*.qrc CMakeLists.txt .
|
||||||
|
RUN mkdir build
|
||||||
|
WORKDIR /appimage/build
|
||||||
|
|
||||||
|
+RUN DEBIAN_FRONTEND=noninteractive apt install -y libboost-regex-dev
|
||||||
|
+
|
||||||
|
RUN cmake -DBUILD_TRANSLATIONS=on .. && make -j 8
|
||||||
|
|
||||||
|
WORKDIR /appimage/AppDir/usr/bin
|
||||||
|
@@ -73,5 +75,4 @@ WORKDIR /appimage
|
||||||
|
RUN PATH=/usr/lib/qt5/bin/:$PATH linuxdeployqt --appimage-extract-and-run AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage
|
||||||
|
|
||||||
|
RUN mkdir -p /output
|
||||||
|
-RUN cp Checks_parser-x86_64.AppImage /output
|
||||||
|
-ENTRYPOINT bash
|
||||||
|
+ENTRYPOINT ["cp", "Checks_parser-x86_64.AppImage", "/output"]
|
Loading…
Reference in New Issue