diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51744e2..15d4b21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,12 +18,13 @@ target_link_libraries(fediblock
   PkgConfig::cgicc
   nlohmann_json
   std::filesystem
-  PkgConfig::libgit2)
+  PkgConfig::libgit2
+  ICU::uc)
 
 if(${CMAKE_VERSION} VERSION_LESS 3.12)
-  target_link_libraries(fediblock PUBLIC ${CURL_LIBRARIES} ICU::uc)
+  target_link_libraries(fediblock PUBLIC ${CURL_LIBRARIES})
 else()
-  target_link_libraries(fediblock PUBLIC CURL::libcurl ICU::uc)
+  target_link_libraries(fediblock PUBLIC CURL::libcurl)
 endif()
 
 add_executable(${PROJECT_NAME} main.cpp)
diff --git a/src/generators/CMakeLists.txt b/src/generators/CMakeLists.txt
index b9fa72e..a800f77 100644
--- a/src/generators/CMakeLists.txt
+++ b/src/generators/CMakeLists.txt
@@ -1,19 +1,13 @@
 include(GNUInstallDirs)
 
-add_executable(gen_html "html.cpp")
-
-target_link_libraries(gen_html
+add_executable(${PROJECT_NAME}-gen_html "html.cpp")
+target_link_libraries(${PROJECT_NAME}-gen_html
   PRIVATE fediblock)
-
-set_target_properties(gen_html PROPERTIES OUTPUT_NAME ${PROJECT_NAME}-gen_html)
-install(TARGETS gen_html
+install(TARGETS ${PROJECT_NAME}-gen_html
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
-add_executable(gen_rss "rss.cpp")
-
-target_link_libraries(gen_rss
+add_executable(${PROJECT_NAME}-gen_rss "rss.cpp")
+target_link_libraries(${PROJECT_NAME}-gen_rss
   PRIVATE fediblock)
-
-set_target_properties(gen_rss PROPERTIES OUTPUT_NAME ${PROJECT_NAME}-gen_rss)
-install(TARGETS gen_rss
+install(TARGETS ${PROJECT_NAME}-gen_rss
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")