Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of

the QT5_BASE_DIR value.

svn path=/trunk/; revision=53717
This commit is contained in:
Jörg Mayer 2013-12-02 09:50:30 +00:00
parent 55544b5c39
commit 20799bdeb4
2 changed files with 3 additions and 2 deletions

View File

@ -410,7 +410,8 @@ if(BUILD_qtshark)
# somewhere. The if WIN32 in this place is annoying as well.
if( WIN32 )
set( QT5_BASE_PATH "$ENV{QT5_BASE_DIR}" )
set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}\\msvc2010" )
set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}" )
# Used for the creation of setpath.bat
set( QT5_DLL_PATH "${CMAKE_PREFIX_PATH}/bin/dummy" )
set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} )
endif()

View File

@ -62,7 +62,7 @@ How to do out of tree build (Win32/64):
1a) Set WIRESHARK_BASE_DIR=c:\wireshark (the parent directory of the
library directory).
1b) set WIRESHARK_TARGET_PLATFORM=win32 (or win64)
1c) set QT5_BASE_DIR=c:\Qt\Qt5.1.1\5.1.1 (or whatever)
1c) set QT5_BASE_DIR=c:\Qt\Qt5.1.1\5.1.1\msvc2010 (or whatever)
2) Install cmake
3) mkdir c:\wireshark\build
4) cd c:\wireshark\build