@@ -35,26 +35,6 @@ endif()
3535
3636configure_file ("include/config.h.in" "include/config.h" )
3737
38- include_directories ("${Anvil_BINARY_DIR} /include"
39- "${Anvil_SOURCE_DIR} "
40- "${Anvil_SOURCE_DIR} /deps"
41- "${ANVIL_GLSLANG_PATH} "
42- "${Anvil_SOURCE_DIR} /include" )
43-
44- # Include the Vulkan header.
45- if (ANVIL_USE_BUILT_IN_VULKAN_HEADERS)
46- include_directories ("${Anvil_SOURCE_DIR} /include" )
47- else ()
48- if (WIN32 )
49- include_directories ($ENV{VK_SDK_PATH} /Include
50- $ENV{VULKAN_SDK} /Include )
51- else ()
52- include_directories ($ENV{VK_SDK_PATH} /x86_64/include
53- $ENV{VULKAN_SDK} /include
54- $ENV{VULKAN_SDK} /x86_64/include )
55- endif ()
56- endif ()
57-
5838if (ANVIL_LINK_STATICALLY_WITH_VULKAN_LIB AND NOT CONTINUOUS_INTEGRATION_RUN)
5939 if ("${CMAKE_SIZEOF_VOID_P} " EQUAL "8" )
6040 find_library (VULKAN_LIBRARY
@@ -264,17 +244,37 @@ endif()
264244
265245add_library (Anvil STATIC ${SRC_LIST} )
266246
247+ target_include_directories (Anvil PUBLIC "${Anvil_BINARY_DIR} /include"
248+ "${Anvil_SOURCE_DIR} "
249+ "${Anvil_SOURCE_DIR} /deps"
250+ "${ANVIL_GLSLANG_PATH} "
251+ "${Anvil_SOURCE_DIR} /include" )
252+
253+ # Include the Vulkan header.
254+ if (ANVIL_USE_BUILT_IN_VULKAN_HEADERS)
255+ target_include_directories (Anvil PUBLIC "${Anvil_SOURCE_DIR} /include" )
256+ else ()
257+ if (WIN32 )
258+ target_include_directories (Anvil PUBLIC $ENV{VK_SDK_PATH} /Include
259+ $ENV{VULKAN_SDK} /Include )
260+ else ()
261+ target_include_directories (Anvil PUBLIC $ENV{VK_SDK_PATH} /x86_64/include
262+ $ENV{VULKAN_SDK} /include
263+ $ENV{VULKAN_SDK} /x86_64/include )
264+ endif ()
265+ endif ()
266+
267267if (WIN32 )
268268 if (ANVIL_LINK_WITH_GLSLANG)
269- target_link_libraries (Anvil glslang OGLCompiler OSDependent SPIRV ${VULKAN_LIBRARY} )
269+ target_link_libraries (Anvil PUBLIC glslang OGLCompiler OSDependent SPIRV ${VULKAN_LIBRARY} )
270270 else ()
271- target_link_libraries (Anvil ${VULKAN_LIBRARY} )
271+ target_link_libraries (Anvil PUBLIC ${VULKAN_LIBRARY} )
272272 endif ()
273273else ()
274274 if (ANVIL_LINK_WITH_GLSLANG)
275- target_link_libraries (Anvil glslang OGLCompiler OSDependent SPIRV ${VULKAN_LIBRARY} pthread )
275+ target_link_libraries (Anvil PUBLIC glslang OGLCompiler OSDependent SPIRV ${VULKAN_LIBRARY} pthread )
276276 else ()
277- target_link_libraries (Anvil ${VULKAN_LIBRARY} pthread )
277+ target_link_libraries (Anvil PUBLIC ${VULKAN_LIBRARY} pthread )
278278 endif ()
279279endif ()
280280
0 commit comments