debug

vnotex · May 3, 2024 · d4c4b87 · d4c4b87
1 parent fad7d95
commit d4c4b87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
@@ -99,10 +99,11 @@ jobs:
         run: |
           cmake --version
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=.\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
           cmake --build .
           cmake --build . --target=deploy
           cmake --build . --target=pack
+          cmake --build . --target=install
           7z x VNote*.zip -o*
           dir
         working-directory: ${{runner.workspace}}/build

diff --git a/src/Packaging.cmake b/src/Packaging.cmake
@@ -58,8 +58,10 @@ function(windeployqt target)
     cmake_path(NORMAL_PATH OPENSSL_LIBS_FILES OUTPUT_VARIABLE OPENSSL_LIBS_FILES)
     install(FILES ${OPENSSL_LIBS_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
 
+    message(INFO " debug: ${OPENSSL_EXTRA_LIB_DIR}")
     file(GLOB OPENSSL_EXTRA_LIB_FILES "${OPENSSL_EXTRA_LIB_DIR}/lib*.dll")
     cmake_path(NORMAL_PATH OPENSSL_EXTRA_LIB_FILES OUTPUT_VARIABLE OPENSSL_EXTRA_LIB_FILES)
+    message(INFO " debug: ${OPENSSL_EXTRA_LIB_FILES}")
     install(FILES ${OPENSSL_EXTRA_LIB_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
     set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)