@@ -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,11 +63,11 @@ 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
6969 $<BUILD_INTERFACE :${IMGUI_INCLUDE_DIR} >
70- $<BUILD_INTERFACE :${PROJECT_SOURCE_DIR} >
70+ $<BUILD_INTERFACE :${PROJECT_SOURCE_DIR} / include >
7171 $<INSTALL_INTERFACE :${CMAKE_INSTALL_INCLUDEDIR} >
7272)
7373target_link_libraries (ImGui-SFML PUBLIC SFML::Graphics OpenGL::GL )
@@ -92,7 +92,7 @@ if(IMGUI_SFML_ENABLE_WARNINGS)
9292 endif ()
9393endif ()
9494foreach (WARNING ${IMGUI_SFML_WARNINGS} )
95- set_property (SOURCE imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING} " )
95+ set_property (SOURCE src/ imgui-SFML.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING} " )
9696endforeach ()
9797
9898# Specify ImGui user config
@@ -111,8 +111,8 @@ target_compile_definitions(ImGui-SFML PUBLIC IMGUI_USER_CONFIG="${IMGUI_SFML_CON
111111
112112# Collect public headers
113113set (IMGUI_SFML_PUBLIC_HEADERS
114- ${PROJECT_SOURCE_DIR} /imgui-SFML.h
115- ${PROJECT_SOURCE_DIR} /imgui-SFML_export.h
114+ ${PROJECT_SOURCE_DIR} /include/ imgui-SFML.h
115+ ${PROJECT_SOURCE_DIR} /include/ imgui-SFML_export.h
116116 ${IMGUI_PUBLIC_HEADERS}
117117)
118118if (IMGUI_SFML_USE_DEFAULT_CONFIG OR (NOT DEFINED "${IMGUI_SFML_CONFIG_INSTALL_DIR} " ))
0 commit comments