Merge pull request #25 from scottsideleau/macos-improvements

MacOS improvements

CMakeLists.txt

@@ -111,12 +111,21 @@ include_directories(${goby_INC_DIR})
 
 ## for MAC OS X 
 if(${APPLE})
-  ## MacPorts
-  include_directories(/opt/local/include)
-  link_directories(/opt/local/lib)
-  ## Fink
-  include_directories(/sw/include)
-  link_directories(/sw/lib)
+	if( EXISTS /opt/local/include AND EXISTS /opt/local/lib )
+    message(status "Detected use of 'MacPorts' for dependencies")
+		include_directories(/opt/local/include)
+		link_directories(/opt/local/lib)
+	endif()
+	if( EXISTS /sw/include AND EXISTS /sw/lib )
+    message(status "Detected use of 'Fink' for dependencies")
+		include_directories(/sw/include)
+		link_directories(/sw/lib)
+	endif()
+  if( EXISTS /usr/local/Cellar )
+    message(status "Detected use of 'Homebrew' for dependencies")
+		include_directories(/usr/local/include)
+		link_directories(/usr/local/lib)
+	endif()
 endif()
 
 set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${goby_BIN_DIR}" "${goby_LIB_DIR}" "${goby_INC_DIR}" "${goby_SHARE_DIR}")
@@ -163,4 +172,4 @@ endforeach()
 # configuration export - installed version
 install(EXPORT goby-config DESTINATION share/goby/cmake)
 # configuration export - local build version
-export(TARGETS ${GOBY_LIBRARY_LIST} FILE ${CMAKE_BINARY_DIR}/goby-config.cmake)
+export(TARGETS ${GOBY_LIBRARY_LIST} FILE ${CMAKE_BINARY_DIR}/goby-config.cmake)

cmake_modules/FindZeroMQ.cmake

@@ -1,6 +1,6 @@
 find_path(ZeroMQ_INCLUDE_DIR zmq.hpp)
 
-find_library(ZeroMQ_LIBRARY NAMES zmq
+find_library(ZeroMQ_LIBRARY NAMES zmqpp zmq
   DOC "The ZeroMQ message passing library" PATHS /usr/lib)
 
 mark_as_advanced(ZeroMQ_INCLUDE_DIR