diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a7884855c9acc648b1cfb8c993cf7314bcd87f9..d26a511d2c778804eef1df17b6620bc858cfa0c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ FetchContent_Declare(
 
 set(FMT_SYSTEM_HEADERS ON)
 FetchContent_MakeAvailable(fmt)
+set_property(TARGET fmt PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 ##############################################
 # Create target and set properties
@@ -72,7 +73,7 @@ if (PYBIND)
         )
 endif()
 
-target_link_libraries(${module_name} PUBLIC fmt::fmt-header-only)
+target_link_libraries(${module_name} PUBLIC fmt::fmt)
 target_compile_features(${module_name} PRIVATE cxx_std_14)
 
 if (DOSANITIZE STREQUAL "ON")
diff --git a/aidge_core-config.cmake.in b/aidge_core-config.cmake.in
index 24a44f513c75038b595be6ded0602ab858deed8b..9862b640541458bdab1b1b8bc2a90297625e35ee 100644
--- a/aidge_core-config.cmake.in
+++ b/aidge_core-config.cmake.in
@@ -1,13 +1,7 @@
 @PACKAGE_INIT@
-Include(FetchContent)
 
-FetchContent_Declare(
-    fmt
-    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-    GIT_TAG        10.2.1 # or a later release
-)
-
-FetchContent_MakeAvailable(fmt)
+include(CMakeFindDependencyMacro)
+find_dependency(fmt)
 
 include(${CMAKE_CURRENT_LIST_DIR}/aidge_core-config-version.cmake)