mir/MEGAcmd
2
0
Fork 0
mirror of https://github.com/meganz/MEGAcmd synced 2025-09-05 00:05:07 +00:00
Code Issues Releases Wiki Activity

adjustments in docker after changes in installation

Browse Source 
- fix missiing $ in cmake file
This commit is contained in:
Pablo Martin
2024-05-09 13:02:44 +02:00
parent 43934183d4
commit 3a31abaa47
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -113,7 +113,7 @@ if(UNIX AND NOT APPLE)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
message(STATUS "Overriding default CMAKE_INSTALL_PREFIX to /") message(STATUS "Overriding default CMAKE_INSTALL_PREFIX to /")
set(CMAKE_INSTALL_PREFIX "/") # override default /usr/local set(CMAKE_INSTALL_PREFIX "/") # override default /usr/local
set(RPATH_FOR_DYNAMIC_LIBS "/{CMAKE_INSTALL_LIBDIR}") set(RPATH_FOR_DYNAMIC_LIBS "/${CMAKE_INSTALL_LIBDIR}")
else() else()
# If explicit cmake prefix at cmake call time, make rpath relative to install dir # If explicit cmake prefix at cmake call time, make rpath relative to install dir
set(RPATH_FOR_DYNAMIC_LIBS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") set(RPATH_FOR_DYNAMIC_LIBS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")

8
build-with-docker/Dockerfile.cmake-v2
View File

@@ -73,12 +73,12 @@ RUN --mount=type=cache,target=/tmp/ccache \
ENABLE_UBSAN=${ENABLE_UBSAN} -D \ ENABLE_UBSAN=${ENABLE_UBSAN} -D \
ENABLE_TSAN=${ENABLE_TSAN} -D \ ENABLE_TSAN=${ENABLE_TSAN} -D \
ENABLE_MEGACMD_TESTS=${ENABLE_MEGACMD_TESTS} \ ENABLE_MEGACMD_TESTS=${ENABLE_MEGACMD_TESTS} \
&& make -C /tmp/build -j$(nproc) mega-cmd mega-cmd-server mega-exec \ && cmake --build /tmp/build -j$(nproc) --target mega-cmd mega-cmd-server mega-exec \
mega-cmd-updater mega-cmd-tests-integration mega-cmd-tests-unit \ mega-cmd-updater mega-cmd-tests-integration mega-cmd-tests-unit \
&& cd /tmp/build \ && cmake --install /tmp/build #|| mkdir /inspectme && mv /tmp/build/* /vcpkg /inspectme
&& make install #|| mkdir /inspectme && mv /tmp/build/* /vcpkg /inspectme
FROM base as final FROM base as final
COPY --from=build /usr/ /usr/ COPY --from=build /usr/bin/mega* /usr/bin/
COPY --from=build /opt/megacmd /opt/megacmd
#COPY --from=build /inspectme /inspectme #COPY --from=build /inspectme /inspectme