Merge pull request #76 from insomniacslk/fix_homebrew_build

Fix build for macOS
insomniacslk · Apr 3, 2020 · 2079431 · 2079431
2 parents ec93f25 + 8e3d350
commit 2079431
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,15 +39,20 @@ else (${libtins_FOUND})
     pkg_search_module(libtins REQUIRED libtins)
 endif (${libtins_FOUND})
 
-pkg_search_module(JSONCPP REQUIRED jsoncpp)
+if (${jsoncpp_FOUND})
+    MESSAGE(STATUS "jsoncpp found via CMake")
+else (${jsoncpp_FOUND})
+    MESSAGE(STATUS "jsoncpp not found via CMake, trying pkg-config")
+    pkg_search_module(JSONCPP REQUIRED jsoncpp)
+endif (${jsoncpp_FOUND})
 
 add_executable(dublin-traceroute src/main.cc)
 target_link_libraries(dublintraceroute ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(dublin-traceroute dublintraceroute)
 target_link_libraries(dublintraceroute tins)
 
 target_link_libraries(dublintraceroute ${JSONCPP_LIBRARIES} jsoncpp)
-target_include_directories(dublintraceroute PUBLIC ${JSONCPP_INCLUDE_DIRS})
+target_include_directories(dublintraceroute PUBLIC ${JSONCPP_INCLUDE_DIRS} ${TINS_INCLUDE_DIRS})
 
 #set_property(TARGET dublintraceroute PROPERTY CXX_STANDARD 11)
 #set_property(TARGET dublintraceroute PROPERTY CXX_STANDARD_REQUIRED ON)

diff --git a/documentation/readme/README.md b/documentation/readme/README.md
@@ -190,8 +190,9 @@ cmake ..
 make
 ```
 
-#### Building on OS X
+#### Building on macOS
 
+You need the latest XCode installed to build this project. Then run:
 ```bash
 brew install https://raw.githubusercontent.com/insomniacslk/dublin-traceroute/master/homebrew/dublin-traceroute.rb
 ```

diff --git a/homebrew/dublin-traceroute.rb b/homebrew/dublin-traceroute.rb
@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
+# You need the latest XCode for this formula to build
 class DublinTraceroute < Formula
-  desc "NAT-aware multipath tracerouting tool"
-  homepage "https://dublin-traceroute.net"
-  url "https://github.com/insomniacslk/dublin-traceroute/archive/v0.4.2.tar.gz"
-  sha256 "255980a630fb0d8b1cac270a656d6236bfddc5ba253bda4b898302918caf76d1"
-  head "https://github.com/insomniacslk/dublin-traceroute.git"
+  desc 'NAT-aware multipath tracerouting tool'
+  homepage 'https://dublin-traceroute.net'
+  url 'https://github.com/insomniacslk/dublin-traceroute/archive/v0.4.2.tar.gz'
+  sha256 '255980a630fb0d8b1cac270a656d6236bfddc5ba253bda4b898302918caf76d1'
+  head 'https://github.com/insomniacslk/dublin-traceroute.git'
 
-  depends_on "cmake" => :build
-  depends_on "libtins"
-  depends_on "jsoncpp"
+  depends_on 'cmake' => :build
+  depends_on 'pkg-config' => :build
+  # this should be in the libtins formula
+  depends_on 'libpcap'
+  depends_on 'libtins'
+  depends_on 'jsoncpp'
 
   def install
-    system "cmake", ".", *std_cmake_args
-    system "make", "install"
+    system 'cmake', '.', *std_cmake_args
+    system 'make', 'install'
   end
 
   test do