mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-15 04:59:42 +08:00
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index f4add26..b87e845 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -80,9 +80,10 @@ include(GNUInstallDirs)
|
||
|
|
configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/src/butil/config.h @ONLY)
|
||
|
|
|
||
|
|
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
||
|
|
-
|
||
|
|
-find_package(GFLAGS REQUIRED)
|
||
|
|
-
|
||
|
|
+set(GFLAGS_USE_TARGET_NAMESPACE ON)
|
||
|
|
+find_package(gflags CONFIG REQUIRED)
|
||
|
|
+set(GFLAGS_LIBRARY gflags::gflags)
|
||
|
|
+if(0)
|
||
|
|
execute_process(
|
||
|
|
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
|
||
|
|
@@ -93,6 +94,8 @@ if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
|
||
|
|
OUTPUT_VARIABLE GFLAGS_NS
|
||
|
|
)
|
||
|
|
endif()
|
||
|
|
+endif()
|
||
|
|
+set(GFLAGS_NS "google")
|
||
|
|
|
||
|
|
include_directories(
|
||
|
|
${PROJECT_SOURCE_DIR}/src
|
||
|
|
@@ -122,21 +125,21 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}")
|
||
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer")
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer")
|
||
|
|
|
||
|
|
-macro(use_cxx11)
|
||
|
|
+macro(use_cxx14)
|
||
|
|
if(CMAKE_VERSION VERSION_LESS "3.1.3")
|
||
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||
|
|
endif()
|
||
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||
|
|
endif()
|
||
|
|
else()
|
||
|
|
- set(CMAKE_CXX_STANDARD 11)
|
||
|
|
+ set(CMAKE_CXX_STANDARD 14)
|
||
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||
|
|
endif()
|
||
|
|
-endmacro(use_cxx11)
|
||
|
|
+endmacro(use_cxx14)
|
||
|
|
|
||
|
|
-use_cxx11()
|
||
|
|
+use_cxx14()
|
||
|
|
|
||
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||
|
|
#required by butil/crc32.cc to boost performance for 10x
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index 95037a0..24007d7 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
||
|
|
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||
|
|
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||
|
|
|
||
|
|
+if(BRPC_WITH_GLOG)
|
||
|
|
+ target_link_libraries(BUTIL_LIB PUBLIC ${GLOG_LIB})
|
||
|
|
+ target_link_libraries(SOURCES_LIB PUBLIC ${GLOG_LIB})
|
||
|
|
+endif()
|
||
|
|
if(NOT BUILD_SHARED_LIBS)
|
||
|
|
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
||
|
|
$<TARGET_OBJECTS:SOURCES_LIB>
|
||
|
|
@@ -41,9 +45,6 @@ if(WITH_THRIFT)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
||
|
|
-if(BRPC_WITH_GLOG)
|
||
|
|
- target_link_libraries(brpc-static ${GLOG_LIB})
|
||
|
|
-endif()
|
||
|
|
target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
||
|
|
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
||
|
|
|
||
|
|
@@ -64,9 +65,6 @@ if(BUILD_SHARED_LIBS)
|
||
|
|
$<TARGET_OBJECTS:SOURCES_LIB>
|
||
|
|
$<TARGET_OBJECTS:PROTO_LIB>)
|
||
|
|
target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
||
|
|
- if(BRPC_WITH_GLOG)
|
||
|
|
- target_link_libraries(brpc-shared ${GLOG_LIB})
|
||
|
|
- endif()
|
||
|
|
if(WITH_THRIFT)
|
||
|
|
target_link_libraries(brpc-shared ${THRIFT_LIB})
|
||
|
|
endif()
|