Improve tests CMake build files.

CMakeLists.txt

@@ -120,30 +120,33 @@ CONFIGURE_FILE(
 )
 
 # Support for pkg-config
-set(CMAKE_INSTALL_LIBDIR lib)
-set(pkgconfig_prefix      ${CMAKE_INSTALL_PREFIX})
-set(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(pkgconfig_libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-set(pkgconfig_version     ${LIBTINS_VERSION})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libtins.pc.in
-               ${CMAKE_CURRENT_BINARY_DIR}/libtins.pc @ONLY)
+SET(CMAKE_INSTALL_LIBDIR lib)
+SET(pkgconfig_prefix      ${CMAKE_INSTALL_PREFIX})
+SET(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX})
+SET(pkgconfig_libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+SET(pkgconfig_version     ${LIBTINS_VERSION})
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libtins.pc.in
+                ${CMAKE_CURRENT_BINARY_DIR}/libtins.pc @ONLY)
 
-install(
+INSTALL(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/libtins.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
-ENABLE_TESTING()
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(examples)
 
 # Only include googletest if the git submodule has been fetched
 IF(EXISTS "${CMAKE_SOURCE_DIR}/googletest/CMakeLists.txt")
+    MESSAGE(STATUS "Tests have been enabled")
+    ENABLE_TESTING()
     ADD_SUBDIRECTORY(googletest)
+    ADD_SUBDIRECTORY(tests)
+ELSE()
+    MESSAGE(STATUS "googletest git submodule is absent. Run `git submodule init && git submodule update` to get it")
 ENDIF()
-ADD_SUBDIRECTORY(tests)
 
 # Add all targets to the build-tree export set
 EXPORT(

tests/CMakeLists.txt

@@ -1,12 +1,2 @@
-IF(gtest_BINARY_DIR)
-    MESSAGE(STATUS "Using googletest git submodule.")
-    SET(GTEST_FOUND true)
-ELSE()
-    FIND_PACKAGE(GTest)
-ENDIF()
-IF(GTEST_FOUND)
-    INCLUDE_DIRECTORIES(${gtest_INCLUDE_DIRS})
-    ADD_SUBDIRECTORY(src)
-ELSE(GTEST_FOUND)
-    MESSAGE(WARNING "Google test not found. Tests disabled.")
-ENDIF(GTEST_FOUND)
+INCLUDE_DIRECTORIES(${gtest_INCLUDE_DIRS})
+ADD_SUBDIRECTORY(src)

tests/src/CMakeLists.txt

@@ -3,6 +3,7 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/include/tins/ 
     ../include/
     ${gtest_SOURCE_DIR}/include
+    ${PCAP_INCLUDE_DIR}
 )
 
 # Find pthread library
@@ -10,7 +11,6 @@ FIND_PACKAGE(Threads REQUIRED)
 
 LINK_DIRECTORIES(
     ${gtest_BINARY_DIR}
-
 )
 # Link against GoogleTest, libtins and pthread.
 # Pthread is required by GoogleTest
@@ -19,6 +19,7 @@ LINK_LIBRARIES(
     gtest_main
     tins 
     ${CMAKE_THREAD_LIBS_INIT}
+    ${PCAP_LIBRARY}
 )
 
 IF(LIBTINS_ENABLE_WPA2)