diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58ace32c3fcdea3d4ec5b074bc41221b962c8f19..33c0c70f2e1427cb5cb1ffbf73ea46c9b5027547 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 
 project(FGGL VERSION 0.1 LANGUAGES CXX)
 
@@ -13,8 +13,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package( glfw3 )
 if ( NOT glfw3_FOUND )
   include(FetchContent)
-  set(GLFW_BUILD_EXAMPLES OFF)
-  set(GLFW_BUILD_TESTS OFF)
+  set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+  set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
   if ( FGGL_WAYLAND )
     set(GLFW_USE_WAYLAND True)
   endif ()
diff --git a/fggl/CMakeLists.txt b/fggl/CMakeLists.txt
index f639ed7e5c47349bba975a935454590629ab238a..18467d10766f12ec8bbb7ace7a9986d0a4665065 100644
--- a/fggl/CMakeLists.txt
+++ b/fggl/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(fggl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 # Graphics backend
 add_subdirectory(gfx)
-target_link_libraries(fggl glfw ${OPENGL_gl_LIBRARY} GLEW)
+target_link_libraries(fggl glfw)
 
 # Debug backend
 add_subdirectory(debug)
diff --git a/fggl/gfx/CMakeLists.txt b/fggl/gfx/CMakeLists.txt
index 2db2c70020d2f9ea9f5da50d45c15b1fe6322692..d2ff4af30e33ba6208baa06a9c65d4a87349c607 100644
--- a/fggl/gfx/CMakeLists.txt
+++ b/fggl/gfx/CMakeLists.txt
@@ -2,6 +2,7 @@
 # OpenGL Backend
 find_package( OpenGL REQUIRED )
 include_directories( ${OPENGL_INCLUDE_DIR} )
+target_link_libraries(fggl OpenGL::OpenGL GLEW)
 
 # GLEW
 find_package( GLEW REQUIRED )