Updated prerequisites and build instructions. Updated Windows install.

This commit is contained in:
Jim Evins
2017-12-13 17:09:20 -05:00
parent 25872eb32c
commit 5e9f8355b9
4 changed files with 120 additions and 28 deletions
+5 -2
View File
@@ -42,13 +42,12 @@ find_package (Qt5Xml 5.4 REQUIRED)
find_package (Qt5Svg 5.4 REQUIRED)
find_package (Qt5LinguistTools)
if (MINGW)
if (WIN32)
# Locate Qt directories
execute_process (COMMAND qtpaths --install-prefix OUTPUT_VARIABLE QT_BASE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
set (QT_BIN_DIR ${QT_BASE_DIR}/bin)
endif ()
#
# Optional dependencies
#
@@ -131,6 +130,10 @@ else (Qt5Test_FOUND)
message (STATUS "QtTest (optional)........ No.")
endif (Qt5Test_FOUND)
if (MSVC)
message (STATUS "MSVC Qt location ........ " ${QT_BASE_DIR})
endif (MSVC)
if (MINGW)
message (STATUS "MinGW location .......... " ${MINGW_BASE_DIR})
message (STATUS "MinGW Qt location ....... " ${QT_BASE_DIR})