Skip to content
This repository has been archived by the owner on Feb 25, 2023. It is now read-only.

Commit

Permalink
Squashed 'deps/ccommon/' changes from 01f970f..4a3a0fd
Browse files Browse the repository at this point in the history 
4a3a0fd Merge pull request twitter#124 from thinkingfish/remove_install
d2964bd Merge pull request twitter#122 from paegun/fix-ubuntu-test-linkage
481597c remove install instructions (will re-add later); get rid of cmake warning
74d9db8 reordered pthread dependency to follow check, the earliest dependent lib.
d5c2fec fixed test linkage for ubuntu, tested on 14.04. added support for test-coverage.sh to use xdg-open rather than open when present, ie on ubuntu.

git-subtree-dir: deps/ccommon
git-subtree-split: 4a3a0fd
  • Loading branch information
Yao Yue committed Apr 28, 2016
1 parent e5c2580 commit 9fa308b
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 26 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ configure_file(
# so we are using list as input until we move to new version
# TODO add build types
add_definitions(-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64)
set(CMAKE_MACOSX_RPATH 1)
set(CFLAGS_LIST
"-std=c11 "
"-ggdb3 -O2 "
Expand Down
7 changes: 0 additions & 7 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,3 @@ set_target_properties (${PROJECT_NAME}-shared
OUTPUT_NAME ${PROJECT_NAME}
VERSION ${${PROJECT_NAME}_VERSION}
SOVERSION 0)

# install instructions
install(TARGETS ${PROJECT_NAME}-static DESTINATION lib)
install(TARGETS ${PROJECT_NAME}-shared DESTINATION lib)
install(DIRECTORY include/
DESTINATION include/${PROJECT_NAME}-${${PROJECT_NAME}_RELEASE_VERSION}
FILES_MATCHING PATTERN "*.h")
13 changes: 11 additions & 2 deletions test-coverage.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ rm -rf lcov _build _bin && mkdir _build && pushd _build && cmake -DCOVERAGE=on .
mkdir lcov
lcov --directory . --capture --output-file lcov/app.info
genhtml lcov/app.info -o lcov/html
if [[ "$OSTYPE" == "darwin"* ]]; then
open lcov/html/index.html

COVERAGE_FILE="lcov/html/index.html"
if which xdg-open; then
OPEN=xdg-open
elif [[ $OSTYPE == "darwin"* ]]; then
OPEN=open
else
>&2 echo "Don't know how to automate open, coverage file is at: $COVERAGE_FILE"
fi
if [[ ! -z "$OPEN" ]]; then
$OPEN $COVERAGE_FILE
fi
set +e
2 changes: 1 addition & 1 deletion test/array/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/bstring/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
3 changes: 1 addition & 2 deletions test/channel/pipe/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
3 changes: 1 addition & 2 deletions test/channel/tcp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/event/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/log/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/metric/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
3 changes: 1 addition & 2 deletions test/option/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} m)
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/pool/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/rbuf/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/ring_array/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
3 changes: 1 addition & 2 deletions test/time/timer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} m)
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})
2 changes: 1 addition & 1 deletion test/time/wheel/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(test_name check_${suite})
set(source check_${suite}.c)

add_executable(${test_name} ${source})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES})
target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)

add_dependencies(check ${test_name})
add_test(${test_name} ${test_name})

0 comments on commit 9fa308b

Please sign in to comment.