Remove include_directories and link_directories (#967)

Remove include_directories and link_directories
effekseer · Oct 25, 2023 · f65d2bb · f65d2bb
1 parent d53c468
commit f65d2bb
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 48 deletions.
diff --git a/Dev/Cpp/CMakeLists.txt b/Dev/Cpp/CMakeLists.txt
@@ -79,17 +79,6 @@ if (BUILD_VIEWER OR BUILD_EDITOR)
     add_subdirectory(3rdParty)
 endif()
 
-# set include directories
-include_directories(
-	Effekseer/
-	include/
-	)
-
-# set lib directories
-link_directories(
-	${PROJECT_SOURCE_DIR}/lib/
-	)
-
 # Add compile targets
 if (BUILD_DX12 OR BUILD_METAL OR BUILD_VULKAN)
     set(BUILD_TEST_TEMP ${BUILD_TEST})

diff --git a/Dev/Cpp/EffekseerMaterial/CMakeLists.txt b/Dev/Cpp/EffekseerMaterial/CMakeLists.txt
@@ -24,9 +24,6 @@ else()
     file(GLOB_RECURSE srcs *.cpp)
 endif()
 
-# set include directories
-include_directories(../include/)
-
 # Add compile targets
 add_library( EffekseerMaterial STATIC ${hs} ${srcs} )
 

diff --git a/Dev/Cpp/EffekseerMaterialCompiler/CMakeLists.txt b/Dev/Cpp/EffekseerMaterialCompiler/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(
 
 target_link_libraries(
     EffekseerMaterialCompilerCommon
-    PRIVATE 
+    PUBLIC
     Effekseer
 )
 

diff --git a/Dev/Cpp/EffekseerMaterialEditor/CMakeLists.txt b/Dev/Cpp/EffekseerMaterialEditor/CMakeLists.txt
@@ -20,10 +20,6 @@ file(GLOB hs
     Dialog/*.h
     Graphics/*.h)
 
-link_directories(
-    ${PROJECT_SOURCE_DIR}/../lib/
-    )
-
 # Add compile targets
 add_executable(
     EffekseerMaterialEditor
@@ -137,7 +133,9 @@ FIND_PACKAGE(OpenGL REQUIRED)
 find_package(X11 REQUIRED)
 find_package(Threads REQUIRED)
 
-include_directories(
+target_include_directories(
+    EffekseerMaterialEditor
+    PRIVATE
     ${OPENGL_INCLUDE_DIR}
     ${X11_INCLUDE_DIR})
 

diff --git a/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt b/Dev/Cpp/EffekseerSoundAL/CMakeLists.txt
@@ -33,7 +33,10 @@ if(OpenAL_FOUND)
     add_library(EffekseerSoundAL STATIC
         ${effekseer_sound_h}
         ${effekseer_sound_src})
-
+
+    target_link_libraries(${PROJECT_NAME} PUBLIC
+        Effekseer)
+
     target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<INSTALL_INTERFACE:include/EffekseerSoundAL>)

diff --git a/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt b/Dev/Cpp/EffekseerSoundDSound/CMakeLists.txt
@@ -28,6 +28,9 @@ add_library(EffekseerSoundDSound STATIC
     ${effekseer_sound_h}
     ${effekseer_sound_src})
 
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    Effekseer)
+
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include/EffekseerSoundDSound>)

diff --git a/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt b/Dev/Cpp/EffekseerSoundOSMixer/CMakeLists.txt
@@ -31,6 +31,9 @@ target_include_directories(
     PRIVATE
     ${EFK_THIRDPARTY_INCLUDES})
 
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    Effekseer)
+
 target_link_directories(
     EffekseerSoundOSMixer
     PRIVATE

diff --git a/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt b/Dev/Cpp/EffekseerSoundXAudio2/CMakeLists.txt
@@ -28,6 +28,9 @@ add_library(EffekseerSoundXAudio2 STATIC
     ${effekseer_sound_h}
     ${effekseer_sound_src})
 
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    Effekseer)
+
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include/EffekseerSoundXAudio2>)

diff --git a/Dev/Cpp/TakeScreenshots/CMakeLists.txt b/Dev/Cpp/TakeScreenshots/CMakeLists.txt
@@ -10,20 +10,6 @@ set(effekseer_take_screenshots_src
     Helper.cpp
 )
 
-include_directories(
-    ${EFK_THIRDPARTY_INCLUDES}
-    ../Effekseer/
-    ../EffekseerRendererGL/
-    ../EffekseerSoundAL/
-    )
-
-if(WIN32)
-include_directories(
-    ${EFK_THIRDPARTY_INCLUDES}
-    ../EffekseerRendererDX11/
-    )
-endif()
-
 set(common_lib)
 set(common_inc)
 
@@ -74,6 +60,18 @@ add_executable(${PROJECT_NAME} ${effekseer_take_screenshots_src})
 target_link_directories(${PROJECT_NAME} PRIVATE ${EFK_THIRDPARTY_LIBRARY_DIRECTORIES})
 target_link_libraries(${PROJECT_NAME} PRIVATE TestRuntimeFramework)
 
+target_include_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${EFK_THIRDPARTY_INCLUDES}
+    )
+
+if(WIN32)
+target_include_directories(
+    ${PROJECT_NAME} PRIVATE
+    ${EFK_THIRDPARTY_INCLUDES}
+    )
+endif()
+
 if (NOT APPLE)
     if(WIN32)
     target_link_libraries(

diff --git a/Dev/Cpp/Viewer/CMakeLists.txt b/Dev/Cpp/Viewer/CMakeLists.txt
@@ -172,11 +172,6 @@ if(WIN32)
     add_definitions(-DIMGUI_IMPL_OPENGL_LOADER_GLEW)
 endif()
 
-link_directories(
-    ${PROJECT_SOURCE_DIR}/../lib/
-)
-
-
 if(CLANG_FORMAT_ENABLED)
     clang_format(Viewer)
 endif()

diff --git a/Examples/CustomAsyncLoader/CMakeLists.txt b/Examples/CustomAsyncLoader/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/CustomLoader/CMakeLists.txt b/Examples/CustomLoader/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/Distortion/CMakeLists.txt b/Examples/Distortion/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/NetworkClient/CMakeLists.txt b/Examples/NetworkClient/CMakeLists.txt
@@ -68,7 +68,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/NetworkServer/CMakeLists.txt b/Examples/NetworkServer/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/OpenGL/CMakeLists.txt b/Examples/OpenGL/CMakeLists.txt
@@ -58,7 +58,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/SortHandle/CMakeLists.txt b/Examples/SortHandle/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}

diff --git a/Examples/Trigger/CMakeLists.txt b/Examples/Trigger/CMakeLists.txt
@@ -86,7 +86,10 @@ endif()
 if(UNIX AND NOT APPLE)
     find_package(X11 REQUIRED)
 
-    include_directories(${X11_INCLUDE_DIR})
+    target_include_directories(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${X11_INCLUDE_DIR})
 
     target_link_libraries(
         ${PROJECT_NAME}