diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b71b6b69c..c0a9b3945a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,7 +374,7 @@ 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( QT5_BASE_PATH "C:\\Qt\\Qt5.1.1\\5.1.1" ) + set( QT5_BASE_PATH "$ENV{QT5_BASE_PATH}" ) 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} ) diff --git a/README.cmake b/README.cmake index 7019938d9a..e98b92e46e 100644 --- a/README.cmake +++ b/README.cmake @@ -63,6 +63,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) 2) Install cmake 3) mkdir c:\wireshark\build 4) cd c:\wireshark\build |