We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Allow both types of #include

file_4128.txt (text/plain), 1.86 KB, created by Mohamed on 2020-02-16 02:57:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mohamed

Created: 2020-02-16 02:57:14 UTC

Size: 1.86 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index f18ec8b61..5794911ef 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -2028,7 +2028,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
> 
> # Always build SDLmain
> add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
>-target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
>+target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
> set(_INSTALL_LIBS "SDL2main")
> if (NOT ANDROID)
>   set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
>@@ -2063,7 +2063,7 @@ if(SDL_SHARED)
>   endif()
>   set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
>   target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
>-  target_include_directories(SDL2 PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
>+  target_include_directories(SDL2 PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
>   if (NOT ANDROID)
>     set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
>   endif()
>@@ -2109,7 +2109,7 @@ if(SDL_STATIC)
>   # libraries - do we need to consider this?
>   set(_INSTALL_LIBS "SDL2-static" ${_INSTALL_LIBS})
>   target_link_libraries(SDL2-static ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
>-  target_include_directories(SDL2-static PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
>+  target_include_directories(SDL2-static PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/SDL2>)
>   if (NOT ANDROID)
>     set_target_properties(SDL2-static PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
>   endif()

Actions: View | Diff

Attachments on bug 4128: 3216 | 3219 | 4218

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.