More fixes for OSX - might work now :-)

svn path=/trunk/; revision=30093

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 37fb5d01a0b97147da0dd11c4acf773a1c45b40a..0438c3a1559d7f01cb6ddbfdef64f3f0e61b40e7 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1168,6 +1168,29 @@ add_lemon_files(LIBWIRESHARK_FILES
        dtd_grammar.lemon
 )
 
+set(epan_LIBS
+       wiretap
+       wsutil
+#      @INET_ATON_LO@
+#      @INET_PTON_LO@
+#      @INET_NTOP_LO@
+#      @SSL_LIBS@
+       ${PCRE_LIBRARIES}
+       ${GLIB2_LIBRARIES}
+       ${PCAP_LIBRARIES}
+#      @SOCKET_LIBS@
+#      @NSL_LIBS@
+       ${CARES_LIBRARIES}
+       ${ADNS_LIBRARIES}
+       ${KERBEROS_LIBRARIES}
+#      @FRAMEWORKS@
+       ${GEOIP_LIBRARIES}
+       ${GCRYPT_LIBRARIES}
+       ${GNUTLS_LIBRARIES}
+       ${SMI_LIBRARIES}
+       ${M_LIBRARIES}
+)
+
 add_library(epan SHARED
        # Needed to trigger build of the include files for x11
        #x11-declarations.h
@@ -1189,6 +1212,8 @@ target_link_libraries(epan
        ${WSPYTHON_LIB}
 )
 
+target_link_libraries(epan ${epan_LIBS})
+
 add_dependencies(epan lemon)
 
 install(TARGETS epan

diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 4d542644d8bdf691e79f662891c48975f6cbd748..ab4ddea0d5aaafc88ac3e3845edf8883dd90298e 100644 (file)
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -101,7 +101,13 @@ ADD_CUSTOM_COMMAND(
       ${CMAKE_SOURCE_DIR}/stat_menu.h
 )
 
+set(wslua_LIBS
+  ${LUA_LIBRARIES}
+)
+
 add_library(wslua STATIC
        ${WSLUA_FILES}
 )
 
+target_link_libraries(wslua ${wslua_LIBS})
+

diff --git a/epan/wspython/CMakeLists.txt b/epan/wspython/CMakeLists.txt
index 6f38de15ef3a8533e82b2889212a71a8378c94d0..0d1ba38b7b29128cf4354320eb15397b0873e036 100644 (file)
--- a/epan/wspython/CMakeLists.txt
+++ b/epan/wspython/CMakeLists.txt
@@ -26,10 +26,16 @@ set(WSPYTHON_FILES
        wspy_proto.c
 )
 
+set(wspython_LIBS
+       ${PYTHON_LIBRARIES}
+)
+
 add_library(wspython STATIC
        ${WSPYTHON_FILES}
 )
 
+target_link_libraries(wspython ${wspython_LIBS})
+
 install(PROGRAMS
                register-dissector.py
                wspy_dissector.py

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 63f274bfaf61277bdaad37d61be3ccda697f478f..dda0409ba66dabc356b4023850084758fd3ba2c9 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -79,10 +79,16 @@ add_yacc_files(WIRETAP_FILES
        ascend.y
 )
 
+set(wiretap_LIBS
+  ${GLIB2_LIBRARIES}
+)
+
 add_library(wiretap SHARED
        ${WIRETAP_FILES}
 )
 
+target_link_libraries(wiretap ${wiretap_LIBS})
+
 install(TARGETS wiretap
        LIBRARY DESTINATION lib
        RUNTIME DESTINATION lib