Cleanup libcheck related code

Ref twitter#202, twitter/pelikan@14fcd34
michalbiesek · Sep 9, 2019 · 6c6b2c7 · 6c6b2c7
1 parent 683bc1a
commit 6c6b2c7
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,6 +85,8 @@ if(BUILD_AND_INSTALL_CHECK)
     set(CMAKE_REQUIRED_LIBRARIES "${CHECK_ROOT_DIR}/lib")
 endif()
 
+find_package(Check)
+
 include(CheckIncludeFiles)
 if(OS_PLATFORM STREQUAL "OS_LINUX")
     check_include_files(linux/time64.h HAVE_TIME64)
@@ -155,7 +157,6 @@ endif(COVERAGE)
 include(FindPackageHandleStandardArgs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
-find_package(Check)
 if(NOT CHECK_FOUND)
     message(WARNING "Check is required to build and run tests")
 endif(NOT CHECK_FOUND)
@@ -193,7 +194,8 @@ include_directories(
 add_subdirectory(src)
 
 if(CHECK_WORKING)
-    include_directories(${include_directories} "${CHECK_INCLUDES}")
+    include_directories(${CHECK_INCLUDE_DIRS})
+    link_directories(${CHECK_LIBRARY_DIRS})
     add_subdirectory(test)
 endif(CHECK_WORKING)
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,7 +1,5 @@
 include_directories(${include_directories} CHECK_INCLUDES)
 
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-
 add_subdirectory(array)
 add_subdirectory(bstring)
 add_subdirectory(buffer)

diff --git a/test/array/CMakeLists.txt b/test/array/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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/buffer/CMakeLists.txt b/test/buffer/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -24,5 +24,4 @@ if(OS_PLATFORM STREQUAL "OS_DARWIN")
     set_target_properties(${test_name} PROPERTIES LINK_FLAGS "-Wl,-F/System/Library/Frameworks")
 endif()
 
-add_dependencies(check ${test_name} ccommon-static)
 add_test(${test_name} ${test_name})
diff --git a/test/metric/CMakeLists.txt b/test/metric/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 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})