@@ -23,36 +23,6 @@ index 90184b6fde..109282af09 100755
2323
2424 get_directory_property(all_inc_dirs INCLUDE_DIRECTORIES)
2525 list(JOIN all_inc_dirs "\r\n" all_inc_dirs)
26- diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake
27- index b36006a55c..f304d20f9f 100755
28- --- a/cmake/external/gflags.cmake
29- +++ b/cmake/external/gflags.cmake
30- @@ -45,12 +45,6 @@ ExternalProject_Add(
31- INSTALL_COMMAND ${INSTALL_COMMAND}
32- CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
33- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
34- - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
35- - -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
36- - -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
37- - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38- - -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
39- - -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
40- -DBUILD_STATIC_LIBS=ON
41- -DCMAKE_INSTALL_PREFIX=${GFLAGS_INSTALL_DIR}
42- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
43- @@ -61,6 +55,12 @@ ExternalProject_Add(
44- -DCMAKE_INSTALL_PREFIX:PATH=${GFLAGS_INSTALL_DIR}
45- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
46- -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
47- + -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
48- + -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
49- + -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
50- + -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
51- + -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
52- + -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
53- BUILD_BYPRODUCTS ${GFLAGS_LIBRARIES})
54-
55- add_library(gflags STATIC IMPORTED GLOBAL)
5626diff --git a/cmake/generic.cmake b/cmake/generic.cmake
5727index e977207378..e3756a5e1d 100644
5828--- a/cmake/generic.cmake
0 commit comments