Skip to content

Hack into the matrix to allow compiling with clang for windows #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Hack into the matrix to allow compiling with clang for windows #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd1d22
fix: Hack cryptopp to make it compile under clang for windows
ENDERZOMBI102 Aug 1, 2024
ceb9f3c
fix: Compressonator failing on linux while targeting windows
ENDERZOMBI102 Aug 1, 2024
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
3 changes: 3 additions & 0 deletions ext/_ext.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ if (NOT TARGET cryptopp::cryptopp)
set(CRYPTOPP_BUILD_TESTING OFF CACHE INTERNAL "")
set(CRYPTOPP_INSTALL OFF CACHE INTERNAL "")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/cryptopp")
if (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC)
target_compile_options(cryptopp PRIVATE -mcrc32 -mssse3)
endif()
endif()


Expand Down
2 changes: 1 addition & 1 deletion ext/compressonator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(COMPRESSONATOR_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")

function(target_link_compressonator TARGET)
if(MSVC)
if(WIN32)
get_target_property(TARGET_MSVC_RUNTIME_LIBRARY ${TARGET} MSVC_RUNTIME_LIBRARY)
if((TARGET_MSVC_RUNTIME_LIBRARY MATCHES "NOTFOUND$") OR (TARGET_MSVC_RUNTIME_LIBRARY MATCHES "DLL$"))
target_link_libraries(${TARGET} PRIVATE
Expand Down