From bc47f9ec7cd4d2a5c897a2a5f8afe3f52bd46ff7 Mon Sep 17 00:00:00 2001 From: opcm Date: Thu, 11 Sep 2025 08:03:34 +0200 Subject: [PATCH 1/4] Update appveyor.yml --- appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index aa1dd482..64fb18f4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,8 @@ configuration: Release platform: x64 before_build: - cmd: >- + nuget restore src\WinMSRDriver\MSR.vcxproj + cmake --version cmake -B build @@ -13,9 +15,11 @@ before_build: build_script: - cmake --build build --config Release --parallel +- msbuild src\WinMSRDriver\MSR.vcxproj /m /t:Build /p:Configuration=Release /p:Platform=x64 after_build: -- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp %APPVEYOR_BUILD_FOLDER%\src\windows\PCM-Service.exe.config +- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp %APPVEYOR_BUILD_FOLDER%\src\windows\PCM-Service.exe.config %APPVEYOR_BUILD_FOLDER%\src\WinMSRDriver\x64\Release\MSR\msr.* artifacts: - path: pcm-all.zip name: pcm-all + From 66eb562ae1868c1398c1bacbe75d4614324a6cb7 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Thu, 11 Sep 2025 13:11:22 +0200 Subject: [PATCH 2/4] use a stable xcode version Change-Id: I827a8825213202d7b94435c27ba330534c94785f --- .github/workflows/macos-scan-build.yml | 4 ++++ .github/workflows/macosx_build.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/macos-scan-build.yml b/.github/workflows/macos-scan-build.yml index f4cbcb7a..d22884c4 100644 --- a/.github/workflows/macos-scan-build.yml +++ b/.github/workflows/macos-scan-build.yml @@ -20,6 +20,10 @@ jobs: with: egress-policy: audit + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.3.1' + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: recursive diff --git a/.github/workflows/macosx_build.yml b/.github/workflows/macosx_build.yml index 623c08d7..24d8e4c7 100644 --- a/.github/workflows/macosx_build.yml +++ b/.github/workflows/macosx_build.yml @@ -20,6 +20,10 @@ jobs: with: egress-policy: audit + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.3.1' + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: recursive From 5ba382359d8db01f0ca55482a4a0d0cf0e81a5a9 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Thu, 11 Sep 2025 14:00:45 +0200 Subject: [PATCH 3/4] osx: add additional headers path Change-Id: I064ffcddd480bc2c46439c5e38d9be4eec22696e --- src/MacMSRDriver/PcmMsr/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MacMSRDriver/PcmMsr/CMakeLists.txt b/src/MacMSRDriver/PcmMsr/CMakeLists.txt index f0434b33..b64cff10 100644 --- a/src/MacMSRDriver/PcmMsr/CMakeLists.txt +++ b/src/MacMSRDriver/PcmMsr/CMakeLists.txt @@ -15,6 +15,7 @@ set_target_properties(PcmMsrDriver PROPERTIES BUNDLE_EXTENSION kext MACOSX_BUNDL target_include_directories(PcmMsrDriver PRIVATE ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers + ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Versions/A/Headers ) target_compile_definitions(PcmMsrDriver PRIVATE -DKERNEL From 795011cb8025e05c69557c92a166c7b716bfb5c0 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Thu, 11 Sep 2025 14:12:30 +0200 Subject: [PATCH 4/4] osx: add additional headers path (II) Change-Id: Id00d1950a0d0dd69ca66b3e31d75bfb9abfb9999 --- src/MacMSRDriver/PcmMsr/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MacMSRDriver/PcmMsr/CMakeLists.txt b/src/MacMSRDriver/PcmMsr/CMakeLists.txt index b64cff10..c76cf4e3 100644 --- a/src/MacMSRDriver/PcmMsr/CMakeLists.txt +++ b/src/MacMSRDriver/PcmMsr/CMakeLists.txt @@ -16,6 +16,7 @@ target_include_directories(PcmMsrDriver PRIVATE ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Versions/A/Headers + /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers ) target_compile_definitions(PcmMsrDriver PRIVATE -DKERNEL