cmake fixes

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()