1 files changed, 25 insertions, 11 deletions
diff --git a/dep/argon2/CMakeLists.txt b/dep/argon2/CMakeLists.txt
index 7b9a993e2a2..a3ee9f88fd1 100644
--- a/dep/argon2/CMakeLists.txt
+++ b/dep/argon2/CMakeLists.txt
@@ -8,18 +8,36 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB_RECURSE sources *.c)
+add_library(argon2 STATIC)
+
+target_sources(argon2
+  PRIVATE
+    argon2/argon2.c
+    argon2/core.c
+    argon2/encoding.c
+    argon2/thread.c
+    argon2/blake2/blake2b.c)
 
 if(TRINITY_SYSTEM_PROCESSOR MATCHES "x86|amd64")
-  list(REMOVE_ITEM sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c)
+  target_sources(argon2 PRIVATE argon2/opt.c)
 else()
-  list(REMOVE_ITEM sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c)
+  target_sources(argon2 PRIVATE argon2/ref.c)
 endif()
 
-add_library(argon2 STATIC
-  ${sources})
+target_sources(argon2
+  PUBLIC
+    FILE_SET HEADERS
+    FILES
+      argon2/argon2.h
+  PRIVATE
+    FILE_SET argon2_private_headers
+    TYPE HEADERS
+    FILES
+      argon2/core.h
+      argon2/encoding.h
+      argon2/thread.h
+      argon2/blake2/blake2.h
+      argon2/blake2/blake2-impl.h)
 
 target_compile_definitions(argon2
   PRIVATE
@@ -27,10 +45,6 @@ target_compile_definitions(argon2
 
 set_target_properties(argon2 PROPERTIES LINKER_LANGUAGE CXX)
 
-target_include_directories(argon2
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR})
-
 target_link_libraries(argon2
   PRIVATE
     trinity-dependency-interface)