Add Qt binaries to MSVC package

Signed-off-by: Martin <[email protected]>

Author: Ho-Ro

cmake/copy_qt5_dlls_to_bin_dir.cmake

@@ -0,0 +1,27 @@
+get_target_property(QT5_BIN_DIR Qt5::Core LOCATION)
+get_filename_component(QT5_BIN_DIR "${QT5_BIN_DIR}" DIRECTORY)
+if (NOT WIN32 OR NOT EXISTS "${QT5_BIN_DIR}/windeployqt.exe")
+    return()
+endif()
+
+# install Qt Dlls into the binary dir on windows platforms
+if (MSVC)
+    add_custom_command(TARGET ${PROJECT_NAME}
+        POST_BUILD
+        # COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
+        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations --compiler-runtime "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${PROJECT_NAME}.exe"
+        WORKING_DIRECTORY "${QT5_BIN_DIR}"
+        COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
+    )
+else()
+    if ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+        set(ADD_OPT "--release")
+    endif()
+    add_custom_command(TARGET ${PROJECT_NAME}
+        POST_BUILD
+        # COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
+        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations --compiler-runtime ${ADD_OPT} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.exe"
+        WORKING_DIRECTORY "${QT5_BIN_DIR}"
+        COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
+    )
+endif()

openhantek/CMakeLists.txt

@@ -2,27 +2,18 @@
 
 project(OpenHantek CXX)
 
-if (WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-    set(CMAKE_EXE_LINKER_FLAGS "-s")
-    set(EXECTYPE WIN32)
-endif()
-
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5PrintSupport REQUIRED)
 find_package(Qt5OpenGL REQUIRED)
 find_package(OpenGL)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
 
 if (Qt5Widgets_VERSION VERSION_LESS 5.4.0)
     message(FATAL_ERROR "Minimum supported Qt5 version is 5.4.0!")
-else()
-    message("-- Qt5 version is ${Qt5Widgets_VERSION}")
 endif()
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 # include directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 include_directories(src/ src/hantekdso src/widgets src/docks src/configdialog)
@@ -33,7 +24,7 @@ file(GLOB_RECURSE HEADERS "src/*.h")
 file(GLOB_RECURSE UI "src/*.ui")
 file(GLOB_RECURSE QRC "res/*.qrc")
 
-if (WIN32)
+if(WIN32)
     file(GLOB_RECURSE RC "res/*.rc")
 endif()
 
@@ -43,9 +34,16 @@ add_custom_target(format SOURCES ".clang-format"
 # here the translation magic happens
 include(translations/Translations.cmake)
 
+set(EXECTYPE "")
+if(WIN32 AND MINGW)
+    set(EXECTYPE WIN32)
+endif()
+
+option(USE_OPENHANTEK_DRIVER "Use OpenHantek Windows driver" ON)
+
 # Enable MacOSX bundle magic in the next line
 option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
-
+#
 if( APPLE AND BUILD_MACOSX_BUNDLE )
     set( EXECTYPE MACOSX_BUNDLE )
     set( MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" )
@@ -55,8 +53,8 @@ if( APPLE AND BUILD_MACOSX_BUNDLE )
     set( MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION} )
     string(TIMESTAMP THISYEAR "%Y")
     set( MACOSX_BUNDLE_COPYRIGHT "(C) 2012-${THISYEAR} OpenHantek community" )
-    set( MACOSX_BUNDLE_ICON_FILE OpenHantek.icns )
-    set( ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/OpenHantek.icns )
+    set( MACOSX_BUNDLE_ICON_FILE openhantek.icns )
+    set( ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/openhantek.icns )
     set_source_files_properties( ${ICONS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" )
 endif()
 
@@ -67,38 +65,38 @@ target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE "/W4" "/wd4251" "/wd4127" "/wd4275" "/wd4200" "/nologo" "/J" "/Zi")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:/MDd>")
-    include(../cmake/docs_on_windows.cmake)
     include(../cmake/fftw_on_windows.cmake)
     include(../cmake/libusb_on_windows.cmake)
+    include(../cmake/copy_qt5_dlls_to_bin_dir.cmake)
+    target_compile_options(${PROJECT_NAME} PRIVATE "/W4" "/wd4251" "/wd4127" "/wd4275" "/wd4200" "/nologo" "/J" "/Zi")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:/MDd>")
 else()
     if( APPLE AND BUILD_MACOSX_BUNDLE )
         # Use own template that defines NSPrincipalClass=NSApplication & NSHighResolutionCapable=True
         set_target_properties( ${PROJECT_NAME} PROPERTIES
             MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/../cmake/OpenHantekBundleInfo.plist.in
         )
     endif()
-    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic)
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-DDEBUG>")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-O0>")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:-fno-rtti>")
-
     find_package(libusb REQUIRED)
     target_include_directories(${PROJECT_NAME} PRIVATE ${LIBUSB_INCLUDE_DIRS})
     target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
 
+    find_package(Threads REQUIRED)
+    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
+
     find_package(FFTW REQUIRED)
     target_include_directories(${PROJECT_NAME} PRIVATE ${FFTW_INCLUDE_DIRS})
     target_link_libraries(${PROJECT_NAME} ${FFTW_LIBRARIES})
 
-    find_package(Threads REQUIRED)
-    target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic)
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-DDEBUG>")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-O0>")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:-fno-rtti>")
 endif()
 
-if (WIN32)
+if(WIN32)
+    include(../cmake/docs_on_windows.cmake)
     include(../cmake/windows_driver.cmake)
-    include(../cmake/windows_documents.cmake)
 endif()
 
 # install commands