From bc268fbaeaeb02cc54ff8361c95884642bbe4d8a Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sun, 5 Jan 2025 01:28:51 +0100 Subject: [PATCH] Remove unused RESOURCES_DIR cmake option --- cmake/Macros.cmake | 5 ++--- examples/island/CMakeLists.txt | 3 +-- examples/joystick/CMakeLists.txt | 3 +-- examples/opengl/CMakeLists.txt | 3 +-- examples/shader/CMakeLists.txt | 3 +-- examples/sound/CMakeLists.txt | 3 +-- examples/sound_effects/CMakeLists.txt | 3 +-- examples/tennis/CMakeLists.txt | 3 +-- examples/vulkan/CMakeLists.txt | 3 +-- examples/win32/CMakeLists.txt | 3 +-- 10 files changed, 11 insertions(+), 21 deletions(-) diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 2a8bec052..eed932f3f 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake @@ -280,12 +280,11 @@ endmacro() # example: sfml_add_example(ftp # SOURCES ftp.cpp ... # BUNDLE_RESOURCES MainMenu.nib ... # Files to be added in target but not installed next to the executable -# DEPENDS SFML::Network -# RESOURCES_DIR resources) # A directory to install next to the executable and sources +# DEPENDS SFML::Network) macro(sfml_add_example target) # parse the arguments - cmake_parse_arguments(THIS "GUI_APP" "RESOURCES_DIR" "SOURCES;BUNDLE_RESOURCES;DEPENDS" ${ARGN}) + cmake_parse_arguments(THIS "GUI_APP" "" "SOURCES;BUNDLE_RESOURCES;DEPENDS" ${ARGN}) # set a source group for the source files source_group("" FILES ${THIS_SOURCES}) diff --git a/examples/island/CMakeLists.txt b/examples/island/CMakeLists.txt index a19660413..3a09497fb 100644 --- a/examples/island/CMakeLists.txt +++ b/examples/island/CMakeLists.txt @@ -6,8 +6,7 @@ set(SRC Island.cpp) # define the island target sfml_add_example(island GUI_APP SOURCES ${SRC} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics) # external dependency headers target_include_directories(island SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/examples/island) diff --git a/examples/joystick/CMakeLists.txt b/examples/joystick/CMakeLists.txt index 1d68c8e4c..de7a9e5fe 100644 --- a/examples/joystick/CMakeLists.txt +++ b/examples/joystick/CMakeLists.txt @@ -4,5 +4,4 @@ set(SRC Joystick.cpp) # define the joystick target sfml_add_example(joystick GUI_APP SOURCES ${SRC} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics) diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index 237d92fe7..f70d4aaf2 100644 --- a/examples/opengl/CMakeLists.txt +++ b/examples/opengl/CMakeLists.txt @@ -12,8 +12,7 @@ endif() sfml_add_example(opengl GUI_APP SOURCES ${SRC} BUNDLE_RESOURCES ${RESOURCES} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics) # external dependency headers target_include_directories(opengl SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/examples/include) diff --git a/examples/shader/CMakeLists.txt b/examples/shader/CMakeLists.txt index 301dbd0eb..11d643360 100644 --- a/examples/shader/CMakeLists.txt +++ b/examples/shader/CMakeLists.txt @@ -4,5 +4,4 @@ set(SRC Shader.cpp) # define the shader target sfml_add_example(shader GUI_APP SOURCES ${SRC} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics) diff --git a/examples/sound/CMakeLists.txt b/examples/sound/CMakeLists.txt index 6d58a067f..b9c708a41 100644 --- a/examples/sound/CMakeLists.txt +++ b/examples/sound/CMakeLists.txt @@ -4,5 +4,4 @@ set(SRC Sound.cpp) # define the sound target sfml_add_example(sound SOURCES ${SRC} - DEPENDS SFML::Audio - RESOURCES_DIR resources) + DEPENDS SFML::Audio) diff --git a/examples/sound_effects/CMakeLists.txt b/examples/sound_effects/CMakeLists.txt index 7af53daf8..3f496f71c 100644 --- a/examples/sound_effects/CMakeLists.txt +++ b/examples/sound_effects/CMakeLists.txt @@ -12,5 +12,4 @@ endif() sfml_add_example(sound-effects GUI_APP SOURCES ${SRC} BUNDLE_RESOURCES ${RESOURCES} - DEPENDS SFML::Audio SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Audio SFML::Graphics) diff --git a/examples/tennis/CMakeLists.txt b/examples/tennis/CMakeLists.txt index 090ec78d4..5b6e833c3 100644 --- a/examples/tennis/CMakeLists.txt +++ b/examples/tennis/CMakeLists.txt @@ -11,5 +11,4 @@ endif() sfml_add_example(tennis GUI_APP SOURCES ${SRC} BUNDLE_RESOURCES ${RESOURCES} - DEPENDS SFML::Audio SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Audio SFML::Graphics) diff --git a/examples/vulkan/CMakeLists.txt b/examples/vulkan/CMakeLists.txt index 556b6c858..4289dc647 100644 --- a/examples/vulkan/CMakeLists.txt +++ b/examples/vulkan/CMakeLists.txt @@ -4,8 +4,7 @@ set(SRC Vulkan.cpp) # define the window target sfml_add_example(vulkan GUI_APP SOURCES ${SRC} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics) # external dependency headers target_include_directories(vulkan SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/examples/vulkan) diff --git a/examples/win32/CMakeLists.txt b/examples/win32/CMakeLists.txt index 001f4bb30..eb105c789 100644 --- a/examples/win32/CMakeLists.txt +++ b/examples/win32/CMakeLists.txt @@ -4,5 +4,4 @@ set(SRC Win32.cpp) # define the win32 target sfml_add_example(win32 GUI_APP SOURCES ${SRC} - DEPENDS SFML::Graphics - RESOURCES_DIR resources) + DEPENDS SFML::Graphics)