@@ -15,7 +15,7 @@ option(IMGUI_SFML_DISABLE_OBSOLETE_FUNCTIONS "Disable obsolete ImGui functions"
1515# If you set IMGUI_SFML_CONFIG_INSTALL_DIR, ImGui-SFML won't install your custom config, because
1616# you might want to do it yourself
1717option (IMGUI_SFML_USE_DEFAULT_CONFIG "Use default imconfig-SFML.h" ON )
18- set (IMGUI_SFML_CONFIG_DIR ${PROJECT_SOURCE_DIR} CACHE PATH "Path to a directory containing user ImGui config" )
18+ set (IMGUI_SFML_CONFIG_DIR ${PROJECT_SOURCE_DIR} / include CACHE PATH "Path to a directory containing user ImGui config" )
1919set (IMGUI_SFML_CONFIG_NAME imconfig-SFML.h CACHE STRING "Name of a custom user ImGui config header" )
2020set (IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header will be installed" )
2121
@@ -63,10 +63,10 @@ find_package(OpenGL REQUIRED)
6363include (GNUInstallDirs)
6464
6565# Define ImGui-SFML
66- add_library (ImGui-SFML imgui-SFML.cpp ${IMGUI_SOURCES} )
66+ add_library (ImGui-SFML src/ imgui-SFML.cpp ${IMGUI_SOURCES} )
6767add_library (ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML)
6868target_include_directories (ImGui-SFML PUBLIC
69- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} >
69+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} / include >
7070 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >
7171)
7272target_include_directories (ImGui-SFML SYSTEM PUBLIC
@@ -94,7 +94,7 @@ if(IMGUI_SFML_ENABLE_WARNINGS)
9494 endif ()
9595endif ()
9696foreach (WARNING ${IMGUI_SFML_WARNINGS} )
97- set_property (SOURCE imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING} " )
97+ set_property (SOURCE src/ imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING} " )
9898endforeach ()
9999
100100# Specify ImGui user config
@@ -113,8 +113,8 @@ target_compile_definitions(ImGui-SFML PUBLIC IMGUI_USER_CONFIG="${IMGUI_SFML_CON
113113
114114# Collect public headers
115115set (IMGUI_SFML_PUBLIC_HEADERS
116- ${PROJECT_SOURCE_DIR} /imgui-SFML.h
117- ${PROJECT_SOURCE_DIR} /imgui-SFML_export.h
116+ ${PROJECT_SOURCE_DIR} /include / imgui-SFML.h
117+ ${PROJECT_SOURCE_DIR} /include / imgui-SFML_export.h
118118 ${IMGUI_PUBLIC_HEADERS}
119119)
120120if (IMGUI_SFML_USE_DEFAULT_CONFIG OR (NOT DEFINED "${IMGUI_SFML_CONFIG_INSTALL_DIR} " ))
@@ -158,6 +158,6 @@ if(IMGUI_SFML_BUILD_TESTING)
158158endif ()
159159
160160add_custom_target (tidy
161- COMMAND run-clang-tidy -quiet -p ${CMAKE_BINARY_DIR} *.cpp examples/**/*.cpp tests/*.cpp
161+ COMMAND run-clang-tidy -quiet -p ${CMAKE_BINARY_DIR} src/ *.cpp examples/**/*.cpp tests/*.cpp
162162 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
163163)
0 commit comments