Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/pullreq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,24 @@ jobs:
run_aptget: false
name: Windows 64bit MSVC

- os: windows-latest
cmakeargs: -A x64 -T ClangCL -G"Visual Studio 17 2022"
install_ninja: false
run_aptget: false
name: Windows 64bit VS ClangCL

- os: windows-latest
cmakeargs: -A arm64ec
install_ninja: false
run_aptget: false
name: Windows arm64ec MSVC

- os: windows-latest
cmakeargs: -A arm64
install_ninja: false
run_aptget: false
name: Windows arm64 MSVC

- os: windows-latest
cmakeargs: -A x64 -DCLAP_WRAPPER_CXX_STANDARD=20
install_ninja: false
Expand Down
7 changes: 5 additions & 2 deletions cmake/shared_prologue.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ target_compile_options(clap-wrapper-compile-options-public INTERFACE -D${CLAP_WR
if (APPLE)
target_link_libraries(clap-wrapper-compile-options-public INTERFACE macos_filesystem_support)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU" AND (NOT (CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")))
message(STATUS "clap-wrapper: using gcc/llvm-clang compile options")

target_compile_options(clap-wrapper-compile-options INTERFACE -Wall -Wextra -Wno-unused-parameter -Wpedantic)
if (WIN32)
# CLang cant do werror on linux thanks to vst3 sdk
Expand Down Expand Up @@ -90,7 +92,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")

endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")
message(STATUS "clap-wrapper: using MSVC/CLangCL compile options")
target_compile_options(clap-wrapper-compile-options-public INTERFACE /utf-8 /Zc:__cplusplus)
if ("${CMAKE_CXX_STANDARD}" GREATER_EQUAL 20)
message(STATUS "clap-wrapper: Turning off char8_t c++20 changes")
Expand Down
2 changes: 1 addition & 1 deletion cmake/wrap_standalone.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function(target_add_standalone_wrapper)
)
endif()

target_link_libraries(${SA_TARGET} PRIVATE base-sdk-wil ComCtl32.Lib)
target_link_libraries(${SA_TARGET} PRIVATE base-sdk-wil ComCtl32.Lib RuntimeObject.Lib)

elseif(UNIX)
target_sources(${SA_TARGET} PRIVATE
Expand Down
Loading