Skip to content

Commit a837b97

Browse files
committed
Fix LLA native name
1 parent 117a4e8 commit a837b97

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

installer/LibLogicalAccess.Msm/config.wxi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<?define Win64 = "yes" ?>
77
<?define PlatformString = "64-bit" ?>
88
<?define lladir = "..\packages\dll\x86_64\Release" ?>
9-
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.win32\bin\x86_64\Release" ?>
9+
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86_64\Release" ?>
1010
<?define islogkbdhook = "islogkbdhook64.exe" ?>
1111
<?define islogkbdhooklib = "islogkbdhooklib64.dll" ?>
1212
<?define libcrypto = "libcrypto-1_1-x64.dll" ?>
@@ -15,7 +15,7 @@
1515
<?define Win64 = "no" ?>
1616
<?define PlatformString = "32-bit" ?>
1717
<?define lladir = "..\packages\dll\x86\Release" ?>
18-
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.win32\bin\x86\Release" ?>
18+
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86\Release" ?>
1919
<?define islogkbdhook = "islogkbdhook32.exe" ?>
2020
<?define islogkbdhooklib = "islogkbdhooklib32.dll" ?>
2121
<?define libcrypto = "libcrypto-1_1.dll" ?>

sources/LibLogicalAccessNet.native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ liblogicalaccess_exception_wrap.cxx
1414
liblogicalaccess_crypto_wrap.cxx
1515
lla_std_types_wrap.cxx)
1616

17-
set(TARGET_NAME LogicalAccessNet.native)
17+
set(TARGET_NAME LibLogicalAccessNet.native)
1818

1919
add_library(${TARGET_NAME} SHARED ${LLA_SWIG_SOURCES})
2020
if (MSVC)

sources/LibLogicalAccessNet.native/conanfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def requirements(self):
2323

2424
def configure(self):
2525
self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
26-
self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
2726

2827
def configure_cmake(self):
2928
cmake = CMake(self, build_type=self.settings.build_type)

0 commit comments

Comments
 (0)