qtshark and wireshark(gtk2) now actually find their libs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52539 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d629cdc8ec362b1e61212834ea4c09ae62e252a5..3b71b6b69cd69cffeeaaed7579f42e76a9e2c018 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -374,7 +374,10 @@ if(BUILD_qtshark)
                # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
                # somewhere. The if WIN32 in this place is annoying as well.
                if( WIN32 )
-                       set(CMAKE_PREFIX_PATH "C:\\Qt\\Qt5.1.1\\5.1.1\\msvc2010\\")
+                       set( QT5_BASE_PATH "C:\\Qt\\Qt5.1.1\\5.1.1" )
+                       set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}\\msvc2010" )
+                       set( QT5_DLL_PATH "${CMAKE_PREFIX_PATH}/bin/dummy" )
+                       set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} )
                endif()
        else()
                set(PACKAGELIST ${PACKAGELIST} Qt4)
@@ -641,10 +644,6 @@ endif()
 include(gmxTestLargeFiles)
 gmx_test_large_files(GMX_LARGEFILES)
 
-#Platform specific
-#if(UNIX)
-#endif()
-
 if(APPLE)
        #
        # We assume that APPLE means OS X so that we have the OS X

diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake
index 16e30ee0677b6aaaada282b5f534709d06e4d706..6c613753f589579135b7f94dc14db91f152a796a 100644 (file)
--- a/cmake/modules/FindWSWinLibs.cmake
+++ b/cmake/modules/FindWSWinLibs.cmake
@@ -34,7 +34,7 @@ function( WSExtendPath _LIB_PATH_LIST _PATH_FILE )
     foreach( THIS_LIB_PATH ${_LIB_PATH_LIST} )
       get_filename_component( LIB_PATH ${THIS_LIB_PATH} PATH )
       # lib is required for linking, the dlls are in bin
-      string( REPLACE "/lib" "/bin" LIB_PATH "${LIB_PATH}" )
+      string( REGEX REPLACE "/lib$" "/bin" LIB_PATH "${LIB_PATH}" )
       #message( STATUS "Raw path ${THIS_LIB_PATH} processed to ${LIB_PATH}." )
       set( WS_LOCAL_LIB_PATHS "${WS_LOCAL_LIB_PATHS}" ${LIB_PATH} )
     endforeach()