From e51a3e0c0440aaf502c84fac7b545e7207f9a375 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Wed, 5 Feb 2025 10:06:56 -0700 Subject: [PATCH] Move source code into include/ and src/ directories --- CMakeLists.txt | 14 +++++++------- imconfig-SFML.h => include/imconfig-SFML.h | 0 imgui-SFML.h => include/imgui-SFML.h | 0 imgui-SFML_export.h => include/imgui-SFML_export.h | 0 imgui-SFML.cpp => src/imgui-SFML.cpp | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename imconfig-SFML.h => include/imconfig-SFML.h (100%) rename imgui-SFML.h => include/imgui-SFML.h (100%) rename imgui-SFML_export.h => include/imgui-SFML_export.h (100%) rename imgui-SFML.cpp => src/imgui-SFML.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7945482..bb933f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ option(IMGUI_SFML_DISABLE_OBSOLETE_FUNCTIONS "Disable obsolete ImGui functions" # If you set IMGUI_SFML_CONFIG_INSTALL_DIR, ImGui-SFML won't install your custom config, because # you might want to do it yourself option(IMGUI_SFML_USE_DEFAULT_CONFIG "Use default imconfig-SFML.h" ON) -set(IMGUI_SFML_CONFIG_DIR ${PROJECT_SOURCE_DIR} CACHE PATH "Path to a directory containing user ImGui config") +set(IMGUI_SFML_CONFIG_DIR ${PROJECT_SOURCE_DIR}/include CACHE PATH "Path to a directory containing user ImGui config") set(IMGUI_SFML_CONFIG_NAME imconfig-SFML.h CACHE STRING "Name of a custom user ImGui config header") set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header will be installed") @@ -63,11 +63,11 @@ find_package(OpenGL REQUIRED) include(GNUInstallDirs) # Define ImGui-SFML -add_library(ImGui-SFML imgui-SFML.cpp ${IMGUI_SOURCES}) +add_library(ImGui-SFML src/imgui-SFML.cpp ${IMGUI_SOURCES}) add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML) target_include_directories(ImGui-SFML PUBLIC $ - $ + $ $ ) target_link_libraries(ImGui-SFML PUBLIC SFML::Graphics OpenGL::GL) @@ -92,7 +92,7 @@ if(IMGUI_SFML_ENABLE_WARNINGS) endif() endif() foreach(WARNING ${IMGUI_SFML_WARNINGS}) - set_property(SOURCE imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING}") + set_property(SOURCE src/imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING}") endforeach() # Specify ImGui user config @@ -111,8 +111,8 @@ target_compile_definitions(ImGui-SFML PUBLIC IMGUI_USER_CONFIG="${IMGUI_SFML_CON # Collect public headers set(IMGUI_SFML_PUBLIC_HEADERS - ${PROJECT_SOURCE_DIR}/imgui-SFML.h - ${PROJECT_SOURCE_DIR}/imgui-SFML_export.h + ${PROJECT_SOURCE_DIR}/include/imgui-SFML.h + ${PROJECT_SOURCE_DIR}/include/imgui-SFML_export.h ${IMGUI_PUBLIC_HEADERS} ) if(IMGUI_SFML_USE_DEFAULT_CONFIG OR (NOT DEFINED "${IMGUI_SFML_CONFIG_INSTALL_DIR}")) @@ -153,6 +153,6 @@ if(IMGUI_SFML_BUILD_TESTING) endif() add_custom_target(tidy - COMMAND run-clang-tidy -quiet -p ${CMAKE_BINARY_DIR} *.cpp examples/**/*.cpp tests/*.cpp + COMMAND run-clang-tidy -quiet -p ${CMAKE_BINARY_DIR} src/*.cpp examples/**/*.cpp tests/*.cpp WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) diff --git a/imconfig-SFML.h b/include/imconfig-SFML.h similarity index 100% rename from imconfig-SFML.h rename to include/imconfig-SFML.h diff --git a/imgui-SFML.h b/include/imgui-SFML.h similarity index 100% rename from imgui-SFML.h rename to include/imgui-SFML.h diff --git a/imgui-SFML_export.h b/include/imgui-SFML_export.h similarity index 100% rename from imgui-SFML_export.h rename to include/imgui-SFML_export.h diff --git a/imgui-SFML.cpp b/src/imgui-SFML.cpp similarity index 100% rename from imgui-SFML.cpp rename to src/imgui-SFML.cpp