Merge branch 'release/qt-conan'

.gitignore

@@ -1,5 +1,6 @@
 compile_commands.json
 _*/
+build/
 build-*
 *.user
 tags

conanfile.txt

@@ -1,4 +1,5 @@
 [requires]
+qt/5.12.0@bincrafters/stable
 protobuf/3.6.1@bincrafters/stable
 protoc_installer/3.6.1@bincrafters/stable
 catch2/2.4.2@bincrafters/stable
@@ -8,3 +9,4 @@ cmake
 
 [options]
 protobuf:shared=False
+qt:qttools=True

source/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.6)
 
-set(BUILD_VERSION_MAJOR_MINOR 0.5)
+set(BUILD_VERSION_MAJOR_MINOR 0.6)
 
 if ($ENV{BUILD_NUMBER})
 	set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})
@@ -92,6 +92,25 @@ target_link_libraries(${PROJECT_NAME}
 		${Protobuf_LIBRARIES}
 )
 
+if (WIN32)
+	get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+	message(STATUS "_qmake_executable: ${_qmake_executable}")
+
+	get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+	message(STATUS "_qt_bin_dir: ${_qt_bin_dir}")
+
+	find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
+
+	if (WINDEPLOYQT_EXECUTABLE)
+		message(STATUS "Found ${WINDEPLOYQT_EXECUTABLE}")
+	else()
+		message(FATAL_ERROR "Unable to find windeployqt")
+	endif()
+
+	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+		COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:${PROJECT_NAME}>)
+endif()
+
 add_subdirectory(Age)
 add_subdirectory(CheckableItem)
 add_subdirectory(CheckableTest)