Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
8041feee
Commit
8041feee
authored
7 years ago
by
zhujiashun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change the way of finding threads
parent
c20a32e8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
CMakeLists.txt
CMakeLists.txt
+4
-3
build_in_travis_ci.sh
build_in_travis_ci.sh
+1
-1
CMakeLists.txt
src/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
8041feee
...
...
@@ -61,13 +61,14 @@ if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))
endif
()
#find_package(Threads REQUIRED)
include
(
FindThreads
)
#find_path(GFLAGS_HEADER NAMES gflags/gflags.h)
#find_library(GFLAGS_LIB NAMES gflags)
#find_package(gflags REQUIRED)
find_path
(
THREADS_HEADER NAMES pthread.h
)
find_library
(
THREADS_LIB NAMES pthread
)
#
find_path(THREADS_HEADER NAMES pthread.h)
#
find_library(THREADS_LIB NAMES pthread)
find_path
(
PROTOBUF_HEADER NAMES google/protobuf/stubs/common.h
)
find_library
(
PROTOBUF_LIB NAMES protobuf
)
...
...
@@ -88,7 +89,7 @@ include_directories(
${
PROTOBUF_HEADER
}
${
LEVELDB_HEADER
}
${
THREAD_HEADER
}
${
THREADS_HEADER
}
#
${THREADS_HEADER}
)
# for *.so
...
...
This diff is collapsed.
Click to expand it.
build_in_travis_ci.sh
View file @
8041feee
...
...
@@ -27,7 +27,7 @@ fi
echo
"start building by cmake"
rm
-rf
build
&&
mkdir
build
&&
cd
build
if
!
cmake
-DBRPC_DEBUG
=
OFF
-
BUILD_EXAMPLE
=
ON
-
BUILD_UNIT_TESTS
=
OFF ..
;
then
if
!
cmake
-DBRPC_DEBUG
=
OFF
-
DBUILD_EXAMPLE
=
ON
-D
BUILD_UNIT_TESTS
=
OFF ..
;
then
echo
"Fail to generate Makefile by cmake"
exit
1
fi
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
View file @
8041feee
...
...
@@ -191,8 +191,8 @@ add_library(brpc SHARED ${SOURCES})
add_library
(
brpc_static STATIC
${
SOURCES
}
)
target_link_libraries
(
brpc
#
${CMAKE_THREAD_LIBS_INIT}
${
THREADS_LIB
}
${
CMAKE_THREAD_LIBS_INIT
}
#
${THREADS_LIB}
#${GFLAGS_LIB}
${
GFLAGS_LIBRARY
}
${
PROTOBUF_LIB
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment