To 4.0.0-U3r1 Adjustment to BundleUtilities.cmake for Universal Qt Versioning

Author: hamlibdk

tools/cmake/4.0.2/share/cmake-4.0/Modules/BundleUtilities.cmake

@@ -762,17 +762,25 @@ function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
   if(resolved_item_compare STREQUAL resolved_embedded_item_compare)
     message(STATUS "warning: resolved_item == resolved_embedded_item - not copying...")
   elseif(${resolved_item} MATCHES "libhamlib-4.dll")
-    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libhamlib-4.dll" "${resolved_embedded_item}")
+    # message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    # execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libhamlib-4.dll" "${resolved_embedded_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "$ENV{JTSDK_TOOLS}/hamlib/qt/$ENV{QTV}/bin/libhamlib-4.dll" "${resolved_embedded_item}")
   elseif(${resolved_item} MATCHES "libusb-1.0.dll")
-    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libusb-1.0.dll" "${resolved_embedded_item}")
-  elseif(${resolved_item} MATCHES "libgcc_s_sjlj-1.dll")
-    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libgcc_s_seh-1.dll" "${resolved_embedded_item}")
+    # message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    # execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libusb-1.0.dll" "${resolved_embedded_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "$ENV{JTSDK_TOOLS}/hamlib/qt/$ENV{QTV}/bin/libusb-1.0.dll" "${resolved_embedded_item}")
+#  elseif(${resolved_item} MATCHES "libgcc_s_sjlj-1.dll")
+    # message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    # execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libgcc_s_sjlj-1.dll" "${resolved_embedded_item}")
+#    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "$ENV{JTSDK_TOOLS}/hamlib/qt/$ENV{QTV}/bin/libgcc_s_sjlj-1.dll "${resolved_embedded_item}")
+  elseif(${resolved_item} MATCHES "libgcc_s_seh-1.dll")
+    # message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    # execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libgcc_s_seh-1.dll" "${resolved_embedded_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "$ENV{JTSDK_TOOLS}/hamlib/qt/$ENV{QTV}/bin/libgcc_s_seh-1.dll" "${resolved_embedded_item}")
   elseif(${resolved_item} MATCHES "libwinpthread-1.dll")
-    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libwinpthread-1.dll" "${resolved_embedded_item}")
+    # message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
+    # execute_process(COMMAND ${CMAKE_COMMAND} -E copy "C:/JTSDK64-Tools/tools/hamlib/qt/5.15.2/bin/libwinpthread-1.dll" "${resolved_embedded_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "$ENV{JTSDK_TOOLS}/hamlib/qt/$ENV{QTV}/bin/libwinpthread-1.dll" "${resolved_embedded_item}")
   else()
     #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")