From ff78baf3b9f97164c6d3594ad80d448d5c5aa732 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Fri, 18 Dec 2020 02:35:23 -0500
Subject: [PATCH] Removed the explicit header definitions from the CMake file

---
 CMakeLists.txt                      | 62 ++++-------------------------
 include/utility/MetadataRetriever.h |  1 -
 2 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a634ac8..42c7df3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,59 +31,10 @@ set(SOURCES
     src/utility/PasswordEncryption.cpp
     src/verify/Initialization.cpp
 )
-set(HEADERS
-    include/callback/StreamCallback.h
-    include/component/AppComponent.hpp
-    include/controller/AlbumController.hpp
-    include/controller/ArtistController.hpp
-    include/controller/CoverArtController.hpp
-    include/controller/GenreController.hpp
-    include/controller/LoginController.hpp
-    include/controller/RegisterController.hpp
-    include/controller/SongController.hpp
-    include/controller/YearController.hpp
-    include/database/AlbumRepository.h
-    include/database/ArtistRepository.h
-    include/database/BaseRepository.h
-    include/database/CoverArtRepository.h
-    include/database/GenreRepository.h
-    include/database/SongRepository.h
-    include/database/UserRepository.h
-    include/database/YearRepository.h
-    include/dto/AlbumDto.hpp
-    include/dto/ArtistDto.hpp
-    include/dto/CoverArtDto.hpp
-    include/dto/GenreDto.hpp
-    include/dto/LoginResultDto.hpp
-    include/dto/SongDto.hpp
-    include/dto/YearDto.hpp
-    include/dto/conversion/DtoConversions.h
-    include/manager/AlbumManager.h
-    include/manager/ArtistManager.h
-    include/manager/CoverArtManager.h
-    include/manager/DirectoryManager.h
-    include/manager/GenreManager.h
-    include/manager/SongManager.h
-    include/manager/TokenManager.h    
-    include/manager/UserManager.h
-    include/manager/YearManager.h
-    include/model/Models.h
-    include/utility/ImageFile.h
-    include/utility/MetadataRetriever.h
-    include/utility/PasswordEncryption.h
-    include/type/AlbumFilter.h
-    include/type/ArtistFilter.h
-    include/type/CoverFilter.h
-    include/type/GenreFilter.h
-    include/type/PathType.h
-    include/type/SaltFilter.h
-    include/type/Scopes.h
-    include/type/SongChanged.h
-    include/type/SongFilter.h
-    include/type/SongUpload.h
-    include/type/UserFilter.h
-    include/type/YearFilter.h
-    include/verify/Initialization.h
+
+
+set(ICARUS_INCLUDE_DIR
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
 
 set (BCRYPTLIB
@@ -93,7 +44,7 @@ set (BCRYPTLIB
 
 #find_library(BCRYPT bcrypt ${BCRYPTLIB})
 
-include_directories(include ${BCRYPTLIB})
+include_directories(${ICARUS_INCLUDE_DIR} ${BCRYPTLIB})
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/oatpp)
 
@@ -108,13 +59,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/authcredentials.json ${CMAKE_BINARY_D
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/database.json ${CMAKE_BINARY_DIR}/bin/database.json COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/paths.json ${CMAKE_BINARY_DIR}/bin/paths.json COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Images/Stock/CoverArt.png ${CMAKE_BINARY_DIR}/bin/CoverArt.png COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/build/icarus ${CMAKE_BINARY_DIR}/bin/icarus COPYONLY)
 
 find_path(JWT_CPP_INCLUDE_DIRS "jwt-cpp/base.h")
 
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(cpr CONFIG REQUIRED)
 
-add_executable(icarus ${SOURCES} ${HEADERS})
+add_executable(icarus ${SOURCES})
 
 
 target_include_directories(icarus PRIVATE ${JWT_CPP_INCLUDE_DIRS})
diff --git a/include/utility/MetadataRetriever.h b/include/utility/MetadataRetriever.h
index b6de9ff..9e564d0 100644
--- a/include/utility/MetadataRetriever.h
+++ b/include/utility/MetadataRetriever.h
@@ -4,7 +4,6 @@
 #include <iostream>
 #include <string>
 
-// #include <attachedpictureframe.h>
 #include <taglib/attachedpictureframe.h>
 #include <taglib/textidentificationframe.h>
 #include <taglib/fileref.h>