Skip to content

Commit 076cbd7

Browse files
authored
Merge pull request #6479 from Project-OSRM/dl_fix_cmake_warning
Fix CMake warning
2 parents afd340d + 898cbe8 commit 076cbd7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

cmake/FindLua.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
# This is because, the lua location is not standardized and may exist in
3737
# locations other than lua/
3838

39-
include(FindPkgConfig)
39+
if(NOT PKG_CONFIG_FOUND)
40+
include(CMakeFindDependencyMacro)
41+
find_dependency(PkgConfig)
42+
endif()
4043

4144
unset(_lua_include_subdirs)
4245
unset(_lua_library_names)

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN mkdir -p /src && mkdir -p /opt
55

66
RUN apt-get update && \
77
apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
8-
libzip-dev libboost1.74-all-dev lua5.4 liblua5.4-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
8+
libzip-dev libboost1.74-all-dev lua5.4 liblua5.4-dev pkg-config -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
99

1010
RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
1111
ldconfig /usr/local/lib && \

0 commit comments

Comments
 (0)