diff --git a/CMakeLists.txt b/CMakeLists.txt
index 127e3f78..22cb279c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,24 +439,9 @@ if (NOT CROSSTOOLS)
 		endif()
 
 	else()
-
-		set(PIP_MSG_crypt "yes")
-		set(PIP_MSG_compress "yes")
-		set(PIP_MODULES pip)
-		add_definitions(-DPIP_CRYPT)
-		add_library(pip_crypt ${pip_LIB_TYPE} ${CPP_LIB_CRYPT})
-		target_link_libraries(pip_crypt pip)
-		list(APPEND PIP_MODULES pip_crypt)
-		set(IO_UTILS_LIBS pip)
-		add_library(pip_io_utils ${pip_LIB_TYPE} ${CPP_LIB_IO_UTILS})
-		list(APPEND IO_UTILS_LIBS pip_crypt)
-		target_link_libraries(pip_io_utils ${IO_UTILS_LIBS})
-		list(APPEND PIP_MODULES pip_io_utils)
-		add_definitions(-DPIP_COMPRESS)
-		add_library(pip_compress ${pip_LIB_TYPE} ${CPP_LIB_COMPRESS})
-		target_link_libraries(pip_compress pip)
-		list(APPEND PIP_MODULES pip_compress)
-
+		pip_module(crypt "sodium" "PIP crypt support" "" "")
+		pip_module(compress "zlib" "PIP compression support" "" "")
+		pip_module(io_utils "pip_crypt" "PIP I/O support" "" " (+crypt)")
 	endif()
 endif()
 
diff --git a/esp-idf/CMakeLists.txt b/esp-idf/CMakeLists.txt
index 56ffa116..56d96be8 100644
--- a/esp-idf/CMakeLists.txt
+++ b/esp-idf/CMakeLists.txt
@@ -31,6 +31,6 @@ add_compile_options(${IDF_CXX_COMPILE_OPTIONS})
 add_definitions(-DESP_PLATFORM)
 add_definitions(-DGCC_NOT_5_2_0=0)
 add_definitions(-DHAVE_CONFIG_H)
-include(../CMakeLists.txt)
+add_subdirectory(.. pip)
 
-target_link_libraries(${COMPONENT_TARGET} pip pip_crypt pip_io_utils pip_compress)
+target_link_libraries(${COMPONENT_TARGET} PIP::Crypt PIP::IOUtils PIP::Compress)