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] CMakeLists.txt patch

file_3166.txt (text/plain), 1.56 KB, created by Wayde Reitsma on 2018-09-23 10:51:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wayde Reitsma

Created: 2018-09-23 10:51:13 UTC

Size: 1.56 KB

patch

obsolete

>diff -r 5231eb2ac4fd CMakeLists.txt
>--- a/CMakeLists.txt	Fri Sep 21 09:41:21 2018 -0700
>+++ b/CMakeLists.txt	Sun Sep 23 20:46:18 2018 +1000
>@@ -1718,7 +1718,7 @@
> 
> # Always build SDLmain
> add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
>-target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include/SDL2>)
>+target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
> set(_INSTALL_LIBS "SDL2main")
> if (NOT ANDROID)
>   set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
>@@ -1747,7 +1747,7 @@
>   endif()
>   set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
>   target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
>-  target_include_directories(SDL2 PUBLIC $<INSTALL_INTERFACE:include/SDL2>)
>+  target_include_directories(SDL2 PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
>   if (NOT ANDROID)
>     set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
>   endif()
>@@ -1773,7 +1773,7 @@
>   # 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 $<INSTALL_INTERFACE:include/SDL2>)
>+  target_include_directories(SDL2-static PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/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 3166: 3307

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.