Merge pull request #2763 from gangliao/fix_glog

FIX: explicitly specify glog install path

Merge pull request #2763 from gangliao/fix_glog
FIX: explicitly specify glog install path
f7682f94 · gangliao · GitHub · 8e8f3601 · ce0d6704 · f7682f94
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

cmake/external/glog.cmake cmake/external/glog.cmake +2 -0

未找到文件。
--- a/cmake/external/glog.cmake
+++ b/cmake/external/glog.cmake
@@ -38,12 +38,14 @@ ExternalProject_Add(
    CMAKE_ARGS      -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
    CMAKE_ARGS      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
    CMAKE_ARGS      -DCMAKE_INSTALL_PREFIX=${GLOG_INSTALL_DIR}
+    CMAKE_ARGS      -DCMAKE_INSTALL_LIBDIR=${GLOG_INSTALL_DIR}/lib
    CMAKE_ARGS      -DCMAKE_POSITION_INDEPENDENT_CODE=ON
    CMAKE_ARGS      -DWITH_GFLAGS=ON
    CMAKE_ARGS      -Dgflags_DIR=${GFLAGS_INSTALL_DIR}/lib/cmake/gflags
    CMAKE_ARGS      -DBUILD_TESTING=OFF
    CMAKE_ARGS      -DCMAKE_BUILD_TYPE=Release
    CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GLOG_INSTALL_DIR}
+                     -DCMAKE_INSTALL_LIBDIR:PATH=${GLOG_INSTALL_DIR}/lib
                     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
                     -DCMAKE_BUILD_TYPE:STRING=Release
 )