diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-12-12 01:36:44 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-12-12 01:36:44 +0000 |
| commit | 8470f36423b5ab904efd8c691136ae9e75743a24 (patch) | |
| tree | f541e68ef5dbe985cf77d3b376eff9462fbfc955 /ui/qt/QtShark.pro | |
| parent | a2459dc786054a856f1c7d604c6bee516baeb38d (diff) | |
| download | wireshark-8470f36423b5ab904efd8c691136ae9e75743a24.tar.gz | |
Update library searches to reflect r53780.
svn path=/trunk/; revision=53955
Diffstat (limited to 'ui/qt/QtShark.pro')
| -rw-r--r-- | ui/qt/QtShark.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 7302eacf34..d46e11e6b2 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -308,8 +308,11 @@ unix { -L../../epan/.libs -Wl,-rpath ../../epan/.libs \ -L../../wiretap/.libs -Wl,-rpath ../../wiretap/.libs \ -L../../wsutil/.libs -Wl,-rpath ../../wsutil/.libs + } else:exists(../../run/libw*) { + message( "Assuming CMake 'run' library path" ) + LIBS += -L../../run -Wl,-rpath ../../run } else:exists(../../lib/libw*) { - message( "Assuming CMake library path" ) + message( "Assuming CMake 'lib' library path" ) LIBS += -L../../lib -Wl,-rpath ../../lib } @@ -337,6 +340,12 @@ unix: { ../../epan/.libs/libwireshark*$$QMAKE_EXTENSION_SHLIB* \ ../../wiretap/.libs/libwiretap*$$QMAKE_EXTENSION_SHLIB* \ ../../wsutil/.libs/libwsutil*$$QMAKE_EXTENSION_SHLIB* + } else:exists(../../run/libw*) { + EXTRA_BINFILES += \ + ../../dumpcap + EXTRA_LIBFILES += ../../run/libwireshark*$$QMAKE_EXTENSION_SHLIB* \ + ../../run/libwiretap*$$QMAKE_EXTENSION_SHLIB* \ + ../../run/libwsutil*$$QMAKE_EXTENSION_SHLIB* } else:exists(../../lib/libw*) { EXTRA_BINFILES += \ ../../dumpcap |