Skip to content

Commit

Permalink
Fix?!?!
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasFella committed Oct 12, 2024
1 parent fcd3384 commit 13f6ae5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ jobs:
run: cmake --build ../build/libQuotient --target update-api

- name: Build and install libQuotient
shell: pwsh
run: |
if [[ '${{ matrix.static-analysis }}' == 'sonar' ]]; then
BUILD_WRAPPER="${{ steps.sonar.outputs.build-wrapper-binary }} --out-dir $BUILD_PATH/sonar"
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ target_link_libraries(${QUOTIENT_LIB_NAME}
PUBLIC ${Qt}::Core ${Qt}::Network ${Qt}::Gui qt${${Qt}Core_VERSION_MAJOR}keychain ${Qt}::Sql
PRIVATE ${Qt}::CorePrivate matrix_rust_sdk_crypto_cpp)

if(WIN32)
if(NOT WIN32)
target_link_libraries(${QUOTIENT_LIB_NAME} PRIVATE PkgConfig::SQLITE)
endif()

Expand Down Expand Up @@ -370,6 +370,7 @@ write_basic_package_version_file(
COMPATIBILITY SameMajorVersion
)

install(TARGETS matrix_rust_sdk_crypto_cpp EXPORT ${QUOTIENT_LIB_NAME}Targets)
export(PACKAGE ${QUOTIENT_LIB_NAME})
export(EXPORT ${QUOTIENT_LIB_NAME}Targets
FILE "${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_NAME}/${QUOTIENT_LIB_NAME}Targets.cmake")
Expand Down
2 changes: 1 addition & 1 deletion matrix-rust-sdk-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tokio = { version = "1.40.0", features = ["full"] }
[target.'cfg(target_os = "windows")'.dependencies]
matrix-sdk-sqlite = { version = "0.7", default-features = false, features = ["bundled", "crypto-store"] }

[target.'cfg(target_os = "unix")'.dependencies]
[target.'cfg(not(target_os = "windows"))'.dependencies]
matrix-sdk-sqlite = { version = "0.7", default-features = false, features = ["crypto-store"] }

[build-dependencies]
Expand Down

0 comments on commit 13f6ae5

Please sign in to comment.