Commit 92510fff authored by zhujiashun's avatar zhujiashun

delete newline in GFLAGS_NS

parent dadbd1a6
...@@ -27,14 +27,14 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) ...@@ -27,14 +27,14 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
find_package(GFLAGS REQUIRED) find_package(GFLAGS REQUIRED)
execute_process( execute_process(
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}'" COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
OUTPUT_VARIABLE GFLAGS_NS OUTPUT_VARIABLE GFLAGS_NS
) )
message("GFLAGS_INCLUDE_PATH=${GFLAGS_INCLUDE_PATH}") message("GFLAGS_INCLUDE_PATH=${GFLAGS_INCLUDE_PATH}")
# STREQUAL not works. Use MATCHES as workaround # STREQUAL not works. Use MATCHES as workaround
if(${GFLAGS_NS} MATCHES ".*GFLAGS_NAMESPACE.*") if(${GFLAGS_NS} MATCHES ".*GFLAGS_NAMESPACE.*")
execute_process( execute_process(
COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{printf(\"%s\",$3)}'" COMMAND bash -c "grep \"#define GFLAGS_NAMESPACE [_A-Za-z0-9]\\+\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $3}' | tr -d '\n'"
OUTPUT_VARIABLE GFLAGS_NS OUTPUT_VARIABLE GFLAGS_NS
) )
endif() endif()
......
...@@ -224,9 +224,8 @@ install(TARGETS brpc ...@@ -224,9 +224,8 @@ install(TARGETS brpc
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
) )
install(DIRECTORY src/ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/
DESTINATION include DESTINATION include
FILES_MATCHING FILES_MATCHING
PATTERN "*.h*" PATTERN "*.h"
PATTERN "*.proto"
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment