diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cmake/modules/FindGTK2.cmake | 3 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 92bf6e1a9c..f8b3ea9003 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,6 +217,11 @@ else() else(APPLE) set(LINK_MODE_MODULE MODULE) endif(APPLE) + if(APPLE) + set(LINK_MODE_MODULE SHARED) + else() + set(LINK_MODE_MODULE MODULE) + endif() endif() # The packagelist is doing some magic: If we add XXX to the packagelist, we @@ -831,7 +836,7 @@ if(BUILD_dumpcap) endif() ADD_CUSTOM_COMMAND( - OUTPUT AUTHORS-SHORT + OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT COMMAND ${PERL} ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl @@ -844,8 +849,8 @@ ADD_CUSTOM_COMMAND( ) ADD_CUSTOM_COMMAND( - OUTPUT AUTHORS-SHORT-FORMAT - wireshark.pod + OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT + ${CMAKE_BINARY_DIR}/wireshark.pod COMMAND ${PERL} ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl @@ -853,7 +858,7 @@ ADD_CUSTOM_COMMAND( > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT COMMAND cat ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template - AUTHORS-SHORT-FORMAT + ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT > ${CMAKE_BINARY_DIR}/wireshark.pod DEPENDS ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index b46919075f..1570f2294e 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -174,6 +174,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) /sw/lib /opt/local/include /opt/local/lib + /opt/local/lib/gtk-2.0/include $ENV{GTKMM_BASEPATH}/include $ENV{GTKMM_BASEPATH}/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include @@ -405,10 +406,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-win32 false true) + _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-quartz false true) _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h) _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-x11 false true) _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-win32 false true) + _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-quartz false true) _GTK2_FIND_INCLUDE_DIR(GTK2_CAIRO_INCLUDE_DIR cairo.h) _GTK2_FIND_LIBRARY (GTK2_CAIRO_LIBRARY cairo false false) diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 67e1ec7d99..7de25299f5 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -94,7 +94,7 @@ add_yacc_files(WIRETAP_FILES set(wiretap_LIBS ${GLIB2_LIBRARIES} - ${Z_LIBRARIES} + ${ZLIB_LIBRARIES} wsutil ) |