diff --git a/tools/registrator/CMakeLists.txt b/tools/registrator/CMakeLists.txt
index 80e4a7e8..daa93f56 100644
--- a/tools/registrator/CMakeLists.txt
+++ b/tools/registrator/CMakeLists.txt
@@ -22,19 +22,26 @@ list( APPEND src_list
   register_wifi.cpp
 )
 
-if(NOT CM_PLATFORM)
-  project("aether-registrator" VERSION "1.0.0" LANGUAGES C CXX)
+if(CM_PLATFORM)
+  #Other platforms
+  msessage(FATAL_ERROR "Platform ${CM_PLATFORM} is not supported")
+  return()
+endif()
 
-  add_executable(${PROJECT_NAME} ${src_list})
-  target_link_libraries(${PROJECT_NAME} PRIVATE aether)
-  target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/..)
+project("aether-registrator" VERSION "1.0.0" LANGUAGES C CXX)
 
-  include(GNUInstallDirs)
-  install(TARGETS ${PROJECT_NAME}
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-else()
-  #Other platforms
-  msessage(FATAL_ERROR "Platform ${CM_PLATFORM} is not supported")
+if(NOT TARGET aether)
+  add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../aether aether)
 endif()
+
+add_executable(${PROJECT_NAME} ${src_list})
+target_link_libraries(${PROJECT_NAME} PRIVATE aether)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/..)
+
+include(GNUInstallDirs)
+install(TARGETS ${PROJECT_NAME}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})