diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | README.cmake | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d578351c24..664e9a683f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/README.cmake b/README.cmake index db17806664..89ba718c45 100644 --- a/README.cmake +++ b/README.cmake @@ -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 |