diff --git a/services/tunnelbroker/CMakeLists.txt b/services/tunnelbroker/CMakeLists.txt
--- a/services/tunnelbroker/CMakeLists.txt
+++ b/services/tunnelbroker/CMakeLists.txt
@@ -77,8 +77,6 @@
 set(
   SOURCE_CODE
 
-  ${DOUBLE_CONVERSION_SOURCES}
-  ${GENERATED_CODE}
   ${SOURCE_CODE}
 )
 
@@ -107,7 +105,6 @@
 add_executable(
   tunnelbroker
 
-  ${GENERATED_CODE}
   ${SOURCE_CODE}
 )
 
@@ -140,7 +137,7 @@
   list(FILTER SOURCE_CODE EXCLUDE REGEX "./src/server.cpp")
   enable_testing()
 
-  find_package(GTest REQUIRED)
+  find_package(GTest CONFIG REQUIRED)
 
   add_executable(
     runTests