diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-12-12 01:46:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-12-12 01:46:09 +0000 |
| commit | 12ef64b1aa4e50e9492a9df091befee0d1a94558 (patch) | |
| tree | 7ad6f168cbf5e6917b82bfa5834fa765de3d9482 /ui/qt/QtShark.pro | |
| parent | 8470f36423b5ab904efd8c691136ae9e75743a24 (diff) | |
| download | wireshark-12ef64b1aa4e50e9492a9df091befee0d1a94558.tar.gz | |
Remove the checks for ../../lib. If it still exists it likely means that
there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt.
svn path=/trunk/; revision=53956
Diffstat (limited to 'ui/qt/QtShark.pro')
| -rw-r--r-- | ui/qt/QtShark.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index d46e11e6b2..5d9bc20ef0 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -309,11 +309,8 @@ unix { -L../../wiretap/.libs -Wl,-rpath ../../wiretap/.libs \ -L../../wsutil/.libs -Wl,-rpath ../../wsutil/.libs } else:exists(../../run/libw*) { - message( "Assuming CMake 'run' library path" ) + message( "Assuming CMake library path" ) LIBS += -L../../run -Wl,-rpath ../../run - } else:exists(../../lib/libw*) { - message( "Assuming CMake 'lib' library path" ) - LIBS += -L../../lib -Wl,-rpath ../../lib } LIBS += -lwireshark -lwiretap -lui -lcodecs -lwsutil \ @@ -346,12 +343,6 @@ unix: { EXTRA_LIBFILES += ../../run/libwireshark*$$QMAKE_EXTENSION_SHLIB* \ ../../run/libwiretap*$$QMAKE_EXTENSION_SHLIB* \ ../../run/libwsutil*$$QMAKE_EXTENSION_SHLIB* - } else:exists(../../lib/libw*) { - EXTRA_BINFILES += \ - ../../dumpcap - EXTRA_LIBFILES += ../../lib/libwireshark*$$QMAKE_EXTENSION_SHLIB* \ - ../../lib/libwiretap*$$QMAKE_EXTENSION_SHLIB* \ - ../../lib/libwsutil*$$QMAKE_EXTENSION_SHLIB* } } |