From 1b8b562271d412cb1368e7d9164b1526b26aa573 Mon Sep 17 00:00:00 2001
From: durswd <swda.durl@gmail.com>
Date: Thu, 26 Oct 2023 04:36:25 +0900
Subject: [PATCH] Refactor cmake

---
 Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt | 9 ++++++---
 Script/Test_Install/src/main.cpp               | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt b/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt
index 1058bb6cf3..d610ef288e 100644
--- a/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt
+++ b/Dev/Cpp/EffekseerRendererCommon/CMakeLists.txt
@@ -53,7 +53,7 @@ FilterFolder("${LocalHeaders}")
 FilterFolder("${LocalSources}")
 
 add_library(${PROJECT_NAME} STATIC ${PublicHeaders} ${LocalHeaders} ${LocalSources})
-target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES})
+target_include_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_INCLUDES})
 target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
@@ -80,11 +80,14 @@ set_target_properties(
     ${PROJECT_NAME} PROPERTIES PUBLIC_HEADER 
      "${PublicHeaders}")
 
+foreach (file ${PublicHeaders})
+    get_filename_component(dir ${file} DIRECTORY)
+    install(FILES ${file} DESTINATION include/EffekseerRendererCommon/${dir})
+endforeach()
+
 install(
     TARGETS ${PROJECT_NAME}
     EXPORT ${PROJECT_NAME}-export
-    INCLUDES DESTINATION include/EffekseerRendererCommon
-    PUBLIC_HEADER DESTINATION include/EffekseerRendererCommon
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
diff --git a/Script/Test_Install/src/main.cpp b/Script/Test_Install/src/main.cpp
index 4648b1b14f..e467f7deb5 100644
--- a/Script/Test_Install/src/main.cpp
+++ b/Script/Test_Install/src/main.cpp
@@ -1,4 +1,5 @@
 #include <Effekseer.h>
+#include <EffekseerRenderer.Renderer.h>
 
 #ifdef _WIN32
 #include <EffekseerRendererDX11.h>
@@ -15,4 +16,4 @@ int main()
 #endif
 
 	return 0;
-}
\ No newline at end of file
+}