Skip to content

Commit f7b3d8b

Browse files
committed
use target_include_directories instead of unscoped include_directory
1 parent ba82fcd commit f7b3d8b

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

CMakeLists.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ PROJECT (stonesense)
22

33
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
44

5-
include_directories (${CMAKE_SOURCE_DIR})
65
install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins/stonesense/configs/
76
DESTINATION "${DFHACK_DATA_DESTINATION}/data/dfhack-config-defaults/stonesense")
87

@@ -130,11 +129,7 @@ IF(UNIX)
130129
${ALLEGRO_DOWNLOAD_DIR}/lib/liballegro_ttf.dylib
131130
${PROJECT_LIBS}
132131
)
133-
include_directories (
134-
${include_directories}
135-
${ALLEGRO_DOWNLOAD_DIR}/include
136-
${ALLEGRO_DOWNLOAD_DIR}/lib/Headers
137-
)
132+
SET(stonesense_INCLUDES ${ALLEGRO_DOWNLOAD_DIR}/include ${ALLEGRO_DOWNLOAD_DIR}/lib/Headers)
138133
if(BUILD_PLUGINS)
139134
install(DIRECTORY ${ALLEGRO_DOWNLOAD_DIR}/lib/
140135
DESTINATION ${DFHACK_LIBRARY_DESTINATION})
@@ -179,10 +174,7 @@ IF(UNIX)
179174
${ALLEGRO_DOWNLOAD_DIR}/lib/liballegro_color.so.5.0
180175
${PROJECT_LIBS}
181176
)
182-
include_directories (
183-
${include_directories}
184-
${ALLEGRO_DOWNLOAD_DIR}/include
185-
)
177+
SET(stonesense_INCLUDES ${ALLEGRO_DOWNLOAD_DIR}/include)
186178
if(BUILD_PLUGINS)
187179
install(DIRECTORY ${ALLEGRO_DOWNLOAD_DIR}/lib/
188180
DESTINATION ${DFHACK_LIBRARY_DESTINATION})
@@ -254,11 +246,9 @@ ELSE(UNIX)
254246
gdiplus.lib
255247
shlwapi.lib
256248
)
257-
include_directories (
258-
${include_directories}
249+
SET(stonesense_INCLUDES
259250
${stonesense_SOURCE_DIR}/win${DFHACK_BUILD_ARCH}/allegro/include
260-
${stonesense_SOURCE_DIR}/win${DFHACK_BUILD_ARCH}/allegro_deps/include
261-
)
251+
${stonesense_SOURCE_DIR}/win${DFHACK_BUILD_ARCH}/allegro_deps/include)
262252
LINK_DIRECTORIES(
263253
${LINK_DIRECTORIES}
264254
${stonesense_SOURCE_DIR}/win${DFHACK_BUILD_ARCH}/allegro/lib
@@ -272,6 +262,7 @@ if(UNIX AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER 6.0)
272262
endif()
273263

274264
DFHACK_PLUGIN(stonesense ${PROJECT_SRCS} LINK_LIBRARIES ${DFHACK_TINYXML} ${PROJECT_LIBS} COMPILE_FLAGS_MSVC "/FI\"Export.h\" /wd4312 /wd4996 /wd4251" COMPILE_FLAGS_GCC "-include Export.h ${STONESENSE_GCC_FLAGS}")
265+
target_include_directories(stonesense PRIVATE ${stonesense_INCLUDES})
275266

276267
IF(MSVC)
277268
# Ignore unhelpful warnings about debug symbols being missing.

0 commit comments

Comments
 (0)