diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-02-09 00:25:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-02-09 00:25:24 +0000 |
| commit | 942650fe0e99e1a7f315ce717043898c5d7612a9 (patch) | |
| tree | 11030f236857b9d9221c8fb15d3f7f0e75c84d50 /ui | |
| parent | efa7e8f2b6856ff069a59efb309a8d8af7b6eaec (diff) | |
Try to figure out if we built the rest of the project using Autotools or
CMake automatically.
svn path=/trunk/; revision=47576
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/QtShark.pro | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index b8b6bf5341..33cdfa28d5 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -269,7 +269,20 @@ macx:QMAKE_LFLAGS += \ -framework CoreFoundation \ -framework SystemConfiguration -unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil -lui \ +unix { + exists(../../epan/.libs/libw*) { + message( "Assuming Autotools library paths" ) + LIBS += \ + -L.. \ + -L../../epan/.libs -Wl,-rpath ../../epan/.libs \ + -L../../wiretap/.libs -Wl,-rpath ../../wiretap/.libs \ + -L../../wsutil/.libs -Wl,-rpath ../../wsutil/.libs + } else:exists(../../lib/libw*) { + message( "Assuming CMake library path" ) + LIBS += -L../../lib -Wl,-rpath ../../lib + } +} +unix:LIBS += -lwireshark -lwiretap -lwsutil -lui \ -lpcap -lui_dirty macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv -lz @@ -280,8 +293,17 @@ EXTRA_BINFILES = \ # http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output unix: { EXTRA_BINFILES += \ - ../../dumpcap \ - ../../lib/*.so \ + ../../dumpcap + + exists(../../epan/.libs/libw*) { + EXTRA_BINFILES += \ + ../../epan/.libs/libwireshark.* \ + ../../wiretap/.libs/libwiretap.* \ + ../../wsutil/.libs/libwsutil.* + } else:exists(../../lib/libw*) { + EXTRA_BINFILES += ../../lib/libw*.so + } + } unix:!macx { for(FILE,EXTRA_BINFILES){ |