Merge pull request #32 from mfontanini/BUG-31

BUG #31 (Closed): Fixed CMake files.

examples/CMakeLists.txt

@@ -13,6 +13,7 @@ IF(libtins_FOUND)
             dns_spoof
             dns_stats
             wps_detect
+            traceroute
         )
     ELSE(HAVE_CXX11)
         MESSAGE(WARNING "Disabling some examples since C++11 support is disabled.")
@@ -24,7 +25,6 @@ IF(libtins_FOUND)
         ${LIBTINS_CXX11_EXAMPLES}
         beacon_display
         portscan
-        traceroute
     )
 
     ADD_EXECUTABLE(arpspoofing EXCLUDE_FROM_ALL arpspoofing.cpp)
@@ -39,11 +39,13 @@ IF(libtins_FOUND)
     ADD_EXECUTABLE(beacon_display EXCLUDE_FROM_ALL beacon_display.cpp)
 
     if(THREADS_FOUND)
-        ADD_EXECUTABLE(portscan EXCLUDE_FROM_ALL portscan.cpp)
-        ADD_EXECUTABLE(traceroute EXCLUDE_FROM_ALL traceroute.cpp)
+        IF(HAVE_CXX11)
+            ADD_EXECUTABLE(traceroute EXCLUDE_FROM_ALL traceroute.cpp)
+            TARGET_LINK_LIBRARIES(traceroute ${CMAKE_THREAD_LIBS_INIT})
+        ENDIF(HAVE_CXX11)
 
+        ADD_EXECUTABLE(portscan EXCLUDE_FROM_ALL portscan.cpp)
         TARGET_LINK_LIBRARIES(portscan ${CMAKE_THREAD_LIBS_INIT})
-        TARGET_LINK_LIBRARIES(traceroute ${CMAKE_THREAD_LIBS_INIT})
     ELSE(THREADS_FOUND)
         MESSAGE(WARNING "Disabling portscan and traceroute examples since pthreads library was not found.")
     ENDIF(THREADS_FOUND)

tests/CMakeLists.txt

@@ -1,5 +1,6 @@
 FIND_PACKAGE(GTest)
 IF(GTEST_FOUND)
+    INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
     ADD_SUBDIRECTORY(src)
 ELSE(GTEST_FOUND)
     MESSAGE(WARNING "Google test not found. Disabling tests.")