diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f31a35..9505418 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,25 +10,32 @@ include(FetchContent)
 FetchContent_Declare(
   Sabai
   GIT_REPOSITORY git@github.com:taylorpool/sabai.git
-  GIT_TAG constexpr
+  GIT_TAG main
 )
 FetchContent_MakeAvailable(Sabai)
 
-add_library(onogawa
-  src/onogawa.cpp
-)
+add_library(onogawa INTERFACE)
 target_include_directories(onogawa
-  PUBLIC
+  INTERFACE
   include
 )
 target_link_libraries(onogawa
+  INTERFACE
   sabai
 )
 
 option(BUILD_Onogawa_TESTS "Build Onogawa Tests" OFF)
 
 if(BUILD_Onogawa_TESTS)
-  find_package(GTest REQUIRED)
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG v1.13.0
+  )
+  FetchContent_MakeAvailable(googletest)
+
+  enable_testing()
 
   add_executable(test_onogawa
     test/test_onogawa.cpp
@@ -36,9 +43,9 @@ if(BUILD_Onogawa_TESTS)
   )
   target_link_libraries(test_onogawa
     onogawa
-    GTest::GTest
-    GTest::Main
+    GTest::gtest_main
   )
+
   include(GoogleTest)
   gtest_discover_tests(test_onogawa)