Skip to content

ak-ffi: match name #1027

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

Open
BeryJu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ak-ffi: match name #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ak-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "ak_ffi"
name = "ak-ffi"
version.workspace = true
edition.workspace = true
license.workspace = true
Expand Down
18 changes: 9 additions & 9 deletions ee/wcp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,22 +270,22 @@ endif()

corrosion_import_crate(
MANIFEST_PATH ../../ak-ffi/Cargo.toml
CRATES ak_ffi
CRATES ak-ffi
)
# getrandom (transitive dep) calls BCryptGenRandom on Windows; propagate the
# requirement to all CMake consumers of ak_ffi via the link interface.
corrosion_link_libraries(ak_ffi bcrypt)
# requirement to all CMake consumers of ak-ffi via the link interface.
corrosion_link_libraries(ak-ffi bcrypt)
corrosion_add_cxxbridge(
ak_ffi_bridge
CRATE ak_ffi
ak-ffi-bridge
CRATE ak-ffi
FILES ffi.rs
)

if(MSVC)
set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
corrosion_set_env_vars(ak_ffi "CFLAGS=-MT" "CXXFLAGS=-MT")
corrosion_set_env_vars(ak_ffi_bridge "CFLAGS=-MT" "CXXFLAGS=-MT")
set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
corrosion_set_env_vars(ak-ffi "CFLAGS=-MT" "CXXFLAGS=-MT")
corrosion_set_env_vars(ak-ffi-bridge "CFLAGS=-MT" "CXXFLAGS=-MT")
endif()

FetchContent_Declare(spdlog
Expand Down
6 changes: 3 additions & 3 deletions ee/wcp/ak_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC
)

target_link_libraries(${PROJECT_NAME}
ak_ffi_bridge
ak-ffi-bridge
spdlog
sentry
)
set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
2 changes: 1 addition & 1 deletion ee/wcp/ak_cred_provider/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ target_link_libraries(${PROJECT_NAME}
${SHLWAPI_LIB_PATH}
ak_common
cefsimple
ak_ffi_bridge
ak-ffi-bridge
)

# TODO: Add tests and install targets if needed.
2 changes: 1 addition & 1 deletion ee/wcp/ak_cred_provider/Credential.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// {
#include "cefsimple/cefsimple_win.h"
// }
#include "ak_ffi_bridge/ffi.h"
#include "ak-ffi-bridge/ffi.h"
#include <WinUser.h>

#define WIN_PASS_LEN 50
Expand Down
2 changes: 1 addition & 1 deletion ee/wcp/ak_cred_provider/Provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "ak_common/include/ak_log.h"
#include "ak_common/include/ak_version.h"
#include "Provider.h"
#include "ak_ffi_bridge/ffi.h"
#include "ak-ffi-bridge/ffi.h"
#include "rust/cxx.h"
#include <spdlog/spdlog.h>

Expand Down
6 changes: 3 additions & 3 deletions ee/wcp/ak_lsa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ target_link_libraries(${PROJECT_NAME}
${CREDUI_LIB_PATH}
${SECUR32_LIB_PATH}
${SHLWAPI_LIB_PATH}
ak_ffi_bridge
ak-ffi-bridge
ak_common
spdlog
)
set_property(TARGET ak_lsa PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded)
2 changes: 1 addition & 1 deletion ee/wcp/ak_lsa/Utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <cassert>
#include <fstream>
#include <wincred.h>
#include "ak_ffi_bridge/ffi.h"
#include "ak-ffi-bridge/ffi.h"
#include "rust/cxx.h"
#include "ak_common/include/ak_log.h"
#include "spdlog/spdlog.h"
Expand Down
2 changes: 1 addition & 1 deletion ee/wcp/cefsimple/simple_app.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "cefsimple/simple_handler.h"
#include "ak_cred_provider/include/resource.h"
#include "include/cef_image.h"
#include "ak_ffi_bridge/ffi.h"
#include "ak-ffi-bridge/ffi.h"
#include "rust/cxx.h"

// GetModuleHandle(NULL) returns a handle to the module that was used to create the process.
Expand Down
2 changes: 1 addition & 1 deletion ee/wcp/cefsimple/simple_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_

#include "rust/cxx.h"
#include "ak_ffi_bridge/ffi.h"
#include "ak-ffi-bridge/ffi.h"
#include <spdlog/spdlog.h>

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion ee/wcp/libcef_dll/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ target_link_libraries(${CEF_TARGET}
${CRYPT32_LIB_PATH}
${NETAPI32_LIB_PATH}
ak_common
ak_ffi_bridge
ak-ffi-bridge
)

# Copy binary and resource files to the target output directory.
Expand Down
Loading