Merge pull request #103 from EmperorYP7/api-completion

feat: Completion of Enforcer API
casbin · Jun 8, 2021 · c4a0e11 · c4a0e11
2 parents e8f4e17 + 47079df
commit c4a0e11
Show file tree

Hide file tree

Showing 18 changed files with 378 additions and 252 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,7 @@ if(NOT DEFINED CMAKE_OBJECT_PATH_MAX)
     set(CMAKE_OBJECT_PATH_MAX 300)
 endif()
 
-set(CMAKE_CXX_STANDARD 11)
+# Setting to C++ standard to C++17
+set(CMAKE_CXX_STANDARD 17)
 
 add_subdirectory(casbin)
diff --git a/casbin/CMakeLists.txt b/casbin/CMakeLists.txt
@@ -3,3 +3,6 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 FILE(GLOB_RECURSE SC_FILES "*.cpp" "*.h")
 
 add_library(casbin ${SC_FILES})
+
+set_target_properties(casbin PROPERTIES PREFIX "")
+set_target_properties(casbin PROPERTIES SUFFIX ".o")
diff --git a/casbin/casbin.vcxproj b/casbin/casbin.vcxproj
@@ -181,6 +181,7 @@
     <ClCompile Include="ip_parser\parser\parseIPv6.cpp" />
     <ClCompile Include="ip_parser\parser\Print.cpp" />
     <ClCompile Include="ip_parser\parser\xtoi.cpp" />
+    <ClCompile Include="logger.cpp" />
     <ClCompile Include="management_api.cpp" />
     <ClCompile Include="model\assertion.cpp" />
     <ClCompile Include="model\function.cpp" />
@@ -263,6 +264,9 @@
     <ClInclude Include="ip_parser\parser\pch.h" />
     <ClInclude Include="ip_parser\parser\Print.h" />
     <ClInclude Include="ip_parser\parser\xtoi.h" />
+    <ClInclude Include="log\default_logger.h" />
+    <ClInclude Include="log\Logger.h" />
+    <ClInclude Include="log\log_util.h" />
     <ClInclude Include="model.h" />
     <ClInclude Include="model\assertion.h" />
     <ClInclude Include="model\function.h" />
@@ -298,4 +302,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/casbin/casbin.vcxproj.filters b/casbin/casbin.vcxproj.filters
@@ -261,6 +261,9 @@
     <ClCompile Include="enforcer_synced.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="config\config_interface.h">
@@ -482,8 +485,17 @@
     <ClInclude Include="util\ticker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="log\default_logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="log\log_util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="log\Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include=".clang-format" />
   </ItemGroup>
-</Project>
+</Project>