Update CMake installation paths to use /usr/local for libraries and pkgconfig
This commit is contained in:
1 parent
5222ae6843
commit
b3676923c3
1 file changed
+5
-3
+5
-3
@@ -799,10 +799,10 @@ RUN curl --fail --location --output thrift.tar.gz \
|
|||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DBUILD_TESTING=OFF \
|
-DBUILD_TESTING=OFF \
|
||||||
-DBUILD_TUTORIALS=OFF \
|
-DBUILD_TUTORIALS=OFF \
|
||||||
-DCMAKE_INSTALL_DIR=lib/x86_64-linux-gnu/cmake \
|
-DCMAKE_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu/cmake \
|
||||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
||||||
-DLIB_INSTALL_DIR=lib/x86_64-linux-gnu \
|
-DLIB_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu \
|
||||||
-DPKGCONFIG_INSTALL_DIR=lib/x86_64-linux-gnu/pkgconfig \
|
-DPKGCONFIG_INSTALL_DIR=/usr/local/lib/x86_64-linux-gnu/pkgconfig \
|
||||||
-DWITH_AS3=OFF \
|
-DWITH_AS3=OFF \
|
||||||
-DWITH_C_GLIB=OFF \
|
-DWITH_C_GLIB=OFF \
|
||||||
-DWITH_CPP=ON \
|
-DWITH_CPP=ON \
|
||||||
@@ -815,6 +815,8 @@ RUN curl --fail --location --output thrift.tar.gz \
|
|||||||
-DWITH_QT5=OFF \
|
-DWITH_QT5=OFF \
|
||||||
-DWITH_ZLIB=OFF \
|
-DWITH_ZLIB=OFF \
|
||||||
&& cmake --build build --parallel "$(nproc)" --target install \
|
&& cmake --build build --parallel "$(nproc)" --target install \
|
||||||
|
&& sed -i 's|^libdir=.*|libdir=${prefix}/lib/x86_64-linux-gnu|' \
|
||||||
|
/usr/local/lib/x86_64-linux-gnu/pkgconfig/thrift.pc \
|
||||||
&& rm -rf build src
|
&& rm -rf build src
|
||||||
|
|
||||||
RUN curl --fail --location --output snappy.tar.gz \
|
RUN curl --fail --location --output snappy.tar.gz \
|
||||||
|
|||||||
Reference in new issue
Block a user