diff --git a/CMakeLists.txt b/CMakeLists.txt index 5635db073..3dc14017c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 " diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 213334a5d..b96b0b532 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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") diff --git a/test-coverage.sh b/test-coverage.sh index 2ccd30d44..f6d923818 100755 --- a/test-coverage.sh +++ b/test-coverage.sh @@ -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 diff --git a/test/array/CMakeLists.txt b/test/array/CMakeLists.txt index bdc7cc9f0..41aa3b488 100644 --- a/test/array/CMakeLists.txt +++ b/test/array/CMakeLists.txt @@ -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}) diff --git a/test/bstring/CMakeLists.txt b/test/bstring/CMakeLists.txt index 41c1f87c6..72e4decdb 100644 --- a/test/bstring/CMakeLists.txt +++ b/test/bstring/CMakeLists.txt @@ -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}) diff --git a/test/channel/pipe/CMakeLists.txt b/test/channel/pipe/CMakeLists.txt index 552999bb2..35a8669cb 100644 --- a/test/channel/pipe/CMakeLists.txt +++ b/test/channel/pipe/CMakeLists.txt @@ -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}) diff --git a/test/channel/tcp/CMakeLists.txt b/test/channel/tcp/CMakeLists.txt index 932e8f12e..7dfa9c54a 100644 --- a/test/channel/tcp/CMakeLists.txt +++ b/test/channel/tcp/CMakeLists.txt @@ -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}) diff --git a/test/event/CMakeLists.txt b/test/event/CMakeLists.txt index 506aa4a83..027b7192b 100644 --- a/test/event/CMakeLists.txt +++ b/test/event/CMakeLists.txt @@ -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}) diff --git a/test/log/CMakeLists.txt b/test/log/CMakeLists.txt index 65caffc89..5c87f50ee 100644 --- a/test/log/CMakeLists.txt +++ b/test/log/CMakeLists.txt @@ -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}) diff --git a/test/metric/CMakeLists.txt b/test/metric/CMakeLists.txt index 29e1cb077..d693a8334 100644 --- a/test/metric/CMakeLists.txt +++ b/test/metric/CMakeLists.txt @@ -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}) diff --git a/test/option/CMakeLists.txt b/test/option/CMakeLists.txt index 951980f85..9dfe88081 100644 --- a/test/option/CMakeLists.txt +++ b/test/option/CMakeLists.txt @@ -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}) diff --git a/test/pool/CMakeLists.txt b/test/pool/CMakeLists.txt index 1fe7362f0..c12118208 100644 --- a/test/pool/CMakeLists.txt +++ b/test/pool/CMakeLists.txt @@ -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}) diff --git a/test/rbuf/CMakeLists.txt b/test/rbuf/CMakeLists.txt index 1b9dfc600..cfbfe661e 100644 --- a/test/rbuf/CMakeLists.txt +++ b/test/rbuf/CMakeLists.txt @@ -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}) diff --git a/test/ring_array/CMakeLists.txt b/test/ring_array/CMakeLists.txt index 8d0f49f17..732100b67 100644 --- a/test/ring_array/CMakeLists.txt +++ b/test/ring_array/CMakeLists.txt @@ -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}) diff --git a/test/time/timer/CMakeLists.txt b/test/time/timer/CMakeLists.txt index 4931ccbac..70e8e2a58 100644 --- a/test/time/timer/CMakeLists.txt +++ b/test/time/timer/CMakeLists.txt @@ -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}) diff --git a/test/time/wheel/CMakeLists.txt b/test/time/wheel/CMakeLists.txt index 8359c01d1..a3c023a18 100644 --- a/test/time/wheel/CMakeLists.txt +++ b/test/time/wheel/CMakeLists.txt @@ -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})