Cleanup libcheck related code

- Ref twitter#202, twitter/pelikan@14fcd34
- Replace CHECK_WORKING with CHECK_FOUND

CMakeLists.txt

@@ -63,28 +63,6 @@ if(HAVE_RUST)
     option(RUST_VERBOSE_BUILD "pass -vv to cargo compilation" OFF)
 endif()
 
-if(BUILD_AND_INSTALL_CHECK)
-    # (simms) What follows is a crime against build systems as we run the build/install
-    # for the check library up front, during the planning phase.
-
-    set(LIBCHECK_PREFIX "${CMAKE_BINARY_DIR}/check")
-
-    # check for a local install of check
-    if(NOT EXISTS "${LIBCHECK_PREFIX}")
-        # (simms) This is terrible and I did it this way to ensure this gets built
-        # before the rest of the 'check' tests run. This should be rewritten so that
-        # the other dependencies know that there's a target that can build check
-        execute_process(
-            COMMAND "bash" "${PROJECT_SOURCE_DIR}/ci/install-check.sh" "${LIBCHECK_PREFIX}"
-            TIMEOUT 300  # if this doesn't build in 5 minutes something is hosed
-        )
-    endif()
-
-    set(CHECK_ROOT_DIR "${LIBCHECK_PREFIX}")
-    set(CMAKE_REQUIRED_INCLUDES "${CHECK_ROOT_DIR}/include")    # these make check link correctly in ccommon and pelikan
-    set(CMAKE_REQUIRED_LIBRARIES "${CHECK_ROOT_DIR}/lib")
-endif()
-
 include(CheckIncludeFiles)
 if(OS_PLATFORM STREQUAL "OS_LINUX")
     check_include_files(linux/time64.h HAVE_TIME64)
@@ -155,16 +133,28 @@ endif(COVERAGE)
 include(FindPackageHandleStandardArgs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
+if(BUILD_AND_INSTALL_CHECK)
+    # (simms) What follows is a crime against build systems as we run the build/install
+    # for the check library up front, during the planning phase.
+
+    set(LIBCHECK_PREFIX "${CMAKE_BINARY_DIR}/check")
+
+    # check for a local install of check
+    if(NOT EXISTS "${LIBCHECK_PREFIX}")
+        # (simms) This is terrible and I did it this way to ensure this gets built
+        # before the rest of the 'check' tests run. This should be rewritten so that
+        # the other dependencies know that there's a target that can build check
+        execute_process(
+            COMMAND "bash" "${PROJECT_SOURCE_DIR}/ci/install-check.sh" "${LIBCHECK_PREFIX}"
+            TIMEOUT 300  # if this doesn't build in 5 minutes something is hosed
+        )
+    endif()
+
+    set(CHECK_ROOT_DIR "${LIBCHECK_PREFIX}")
+    set(CMAKE_REQUIRED_INCLUDES "${CHECK_ROOT_DIR}/include")    # these make check link correctly in ccommon and pelikan
+    set(CMAKE_REQUIRED_LIBRARIES "${CHECK_ROOT_DIR}/lib")
+endif()
 find_package(Check)
-if(NOT CHECK_FOUND)
-    message(WARNING "Check is required to build and run tests")
-endif(NOT CHECK_FOUND)
-if(CHECK_FOUND)
-    check_symbol_exists(ck_assert_int_eq check.h CHECK_WORKING)
-    if(NOT CHECK_WORKING)
-        message(WARNING "Check version too old to build tests")
-    endif(NOT CHECK_WORKING)
-endif(CHECK_FOUND)
 
 if (HAVE_ITT_INSTRUMENTATION)
     if(PKG_CONFIG_FOUND)
@@ -192,10 +182,12 @@ include_directories(
 
 add_subdirectory(src)
 
-if(CHECK_WORKING)
-    include_directories(${include_directories} "${CHECK_INCLUDES}")
+if(CHECK_FOUND)
+    include_directories(${CHECK_INCLUDE_DIRS})
+    link_directories(${CHECK_LIBRARY_DIRS})
+    link_libraries(${CHECK_LIBRARIES})
     add_subdirectory(test)
-endif(CHECK_WORKING)
+endif(CHECK_FOUND)
 
 
 if(HAVE_RUST)
@@ -221,4 +213,4 @@ message(STATUS "HAVE_SIGNAME: " ${HAVE_SIGNAME})
 
 message(STATUS "HAVE_BACKTRACE: " ${HAVE_BACKTRACE})
 
-message(STATUS "CHECK_WORKING: " ${CHECK_WORKING})
+message(STATUS "CHECK_FOUND: " ${CHECK_FOUND})

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)

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})

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})

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})

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})

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})

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})

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})

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})

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})

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})

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})

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})

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})

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})