From 1a06f6c3959051080cc3c7b561ade4b3a471d4d7 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Thu, 26 Oct 2023 15:33:00 -0600 Subject: [PATCH] Consolidate `target_include_directories` calls --- src/SFML/Graphics/CMakeLists.txt | 10 +++++----- src/SFML/Window/CMakeLists.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt index 4886ac71f..f1a922a06 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/SFML/Graphics/CMakeLists.txt @@ -92,11 +92,11 @@ sfml_add_library(Graphics # setup dependencies target_link_libraries(sfml-graphics PUBLIC SFML::Window) -# stb_image sources -target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") - -# glad sources -target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include") +# 3rd party sources +target_include_directories(sfml-graphics SYSTEM PRIVATE + ${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image + ${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include +) # find external libraries if(SFML_OS_ANDROID) diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt index ae9d90ec8..471875f71 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/SFML/Window/CMakeLists.txt @@ -282,8 +282,11 @@ if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD) endif() target_link_libraries(sfml-window PUBLIC SFML::System) -# glad sources -target_include_directories(sfml-window SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include") +# 3rd party sources +target_include_directories(sfml-window SYSTEM PRIVATE + ${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include + ${PROJECT_SOURCE_DIR}/extlibs/headers/vulkan +) # When static linking on macOS, we need to add this flag for objective C to work # https://developer.apple.com/library/archive/qa/qa1490/_index.html @@ -291,9 +294,6 @@ if((NOT BUILD_SHARED_LIBS) AND SFML_OS_MACOS) target_link_libraries(sfml-window PRIVATE -ObjC) endif() -# Vulkan headers -target_include_directories(sfml-window SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/vulkan") - # CMake 3.11 and later prefer to choose GLVND, but we choose legacy OpenGL for backward compatibility # (unless the OpenGL_GL_PREFERENCE was explicitly set) # See CMP0072 for more details (cmake --help-policy CMP0072)