Merge pull request #174 from triplef/patch-1

Improve Windows link library dependency
itay-grudev · Sep 17, 2023 · d815ce3 · d815ce3
2 parents 14e9d14 + 0d0666f
commit d815ce3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,6 +54,9 @@ jobs:
         with:
           version: ${{ matrix.qt_version }}
 
+      - name: Setup MSVC environment for QMake
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Build library with CMake
         run: |
           cmake . ${{ matrix.additional_arguments }}
@@ -83,9 +86,6 @@ jobs:
           cmake . ${{ matrix.additional_arguments }}
           cmake --build .
 
-      - name: Setup MSVC environment for QMake
-        uses: ilammy/msvc-dev-cmd@v1
-
       - name: Build basic example with QMake
         working-directory: examples/basic/
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.4.1
+
+* Improved Windows advapi32 link library dependency. - _Frederik Seiffert_
+
 ## 3.4.0
 
 * Provide API for blocking sendMessage. - _Christoph Cullmann_

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})
 
 if(WIN32)
-    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
+    find_library(advapi32_LIBRARY advapi32 REQUIRED)
+    mark_as_advanced(advapi32_LIBRARY)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${advapi32_LIBRARY})
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC QAPPLICATION_CLASS=${QAPPLICATION_CLASS})