Fix LLA native name

liblogicalaccess · Jan 18, 2024 · a837b97 · a837b97
1 parent 117a4e8
commit a837b97
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/installer/LibLogicalAccess.Msm/config.wxi b/installer/LibLogicalAccess.Msm/config.wxi
@@ -6,7 +6,7 @@
       <?define Win64 = "yes" ?>
       <?define PlatformString = "64-bit" ?>
       <?define lladir = "..\packages\dll\x86_64\Release" ?>
-      <?define llaw32dir = "..\..\sources\LibLogicalAccessNet.win32\bin\x86_64\Release" ?>
+      <?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86_64\Release" ?>
       <?define islogkbdhook = "islogkbdhook64.exe" ?>
       <?define islogkbdhooklib = "islogkbdhooklib64.dll" ?>
       <?define libcrypto = "libcrypto-1_1-x64.dll" ?>
@@ -15,7 +15,7 @@
       <?define Win64 = "no" ?>
       <?define PlatformString = "32-bit" ?>
       <?define lladir = "..\packages\dll\x86\Release" ?>
-      <?define llaw32dir = "..\..\sources\LibLogicalAccessNet.win32\bin\x86\Release" ?>
+      <?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86\Release" ?>
       <?define islogkbdhook = "islogkbdhook32.exe" ?>
       <?define islogkbdhooklib = "islogkbdhooklib32.dll" ?>
       <?define libcrypto = "libcrypto-1_1.dll" ?>

diff --git a/sources/LibLogicalAccessNet.native/CMakeLists.txt b/sources/LibLogicalAccessNet.native/CMakeLists.txt
@@ -14,7 +14,7 @@ liblogicalaccess_exception_wrap.cxx
 liblogicalaccess_crypto_wrap.cxx
 lla_std_types_wrap.cxx)
 
-set(TARGET_NAME LogicalAccessNet.native)
+set(TARGET_NAME LibLogicalAccessNet.native)
 
 add_library(${TARGET_NAME} SHARED ${LLA_SWIG_SOURCES})
 if (MSVC)

diff --git a/sources/LibLogicalAccessNet.native/conanfile.py b/sources/LibLogicalAccessNet.native/conanfile.py
@@ -23,7 +23,6 @@ def requirements(self):
 
     def configure(self):
         self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
-        self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
 
     def configure_cmake(self):
         cmake = CMake(self, build_type=self.settings.build_type)