andreacasalino
diff --git a/‎CMakeLists.txt‎
Lines changed: 1 addition & 8 deletions b/‎CMakeLists.txt‎
Lines changed: 1 addition & 8 deletions
diff --git a/‎Lib/CMakeLists.txt‎
Lines changed: 3 additions & 0 deletions b/‎Lib/CMakeLists.txt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎cmake/AutoCollect.cmake‎
Lines changed: 0 additions & 82 deletions b/‎cmake/AutoCollect.cmake‎
Lines changed: 0 additions & 82 deletions
diff --git a/‎cmake/GroupSources.cmake‎
Lines changed: 0 additions & 49 deletions b/‎cmake/GroupSources.cmake‎
Lines changed: 0 additions & 49 deletions
diff --git a/‎cmake/MakeLibrary.cmake‎
Lines changed: 7 additions & 5 deletions b/‎cmake/MakeLibrary.cmake‎
Lines changed: 7 additions & 5 deletions
@@ -4,14 +4,7 @@ option(LIB_OPT "Compile shared libraries (ON) or static (OFF)" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 
-# set macro-directory and find scripts
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
-
-# include cmake custom functions
-set(WITH_SOURCE_TREE ON)
-include(GroupSources)
-include(AutoCollect)
-include(MakeLibrary)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/MakeLibrary.cmake)
 
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
 
@@ -13,13 +13,16 @@ if(ENABLE_XML_Parser_nlohmann_json_converter)
 		ENABLE_XML_Parser_nlohmann_json_converter
 	)
 
+
+    if (NOT TARGET nlohmann_json::nlohmann_json)
 	include(FetchContent)
 	FetchContent_Declare(
 	json_lib
 	GIT_REPOSITORY https://github.com/nlohmann/json.git
 	GIT_TAG        v3.10.5
 	)
 	FetchContent_MakeAvailable(json_lib)
+    endif()
 
 	target_link_libraries(${PROJECT_SHORTNAME} PUBLIC 
 		nlohmann_json::nlohmann_json
 
@@ -1,6 +1,8 @@
 function(MakeLibrary LIBRARY_NAME INCLUDE_DIR)
-CollectSourceFiles(${CMAKE_CURRENT_SOURCE_DIR} SOURCES)
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+file(GLOB_RECURSE SOURCES 
+${CMAKE_CURRENT_SOURCE_DIR}/*.h 
+${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+)
 
 if(LIB_OPT)
 	if (WIN32)
@@ -12,11 +14,11 @@ else()
 	add_library(${LIBRARY_NAME} STATIC ${SOURCES})
 endif()
 
-target_include_directories(${LIBRARY_NAME}
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_DIR}>
+target_include_directories(${LIBRARY_NAME} PUBLIC 
+	${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_DIR}
 )
 
 install(TARGETS ${LIBRARY_NAME})
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_DIR}/ DESTINATION include/${LIBRARY_NAME} FILES_MATCHING PATTERN "*.h*")
 endfunction()
+