mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: use target_compile_options to use -idirafter for khronos headers

This commit is contained in:
Anonymous Maarten 2023-01-07 16:55:32 +01:00 committed by Anonymous Maarten
parent 4d9ee735fd
commit 5555284a70
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -301,10 +301,13 @@ target_include_directories(sdl-build-options
) )
# Note: The clang toolset for Visual Studio does not support the '-idirafter' option. # Note: The clang toolset for Visual Studio does not support the '-idirafter' option.
if(USE_GCC OR (USE_CLANG AND NOT MSVC_CLANG)) if(USE_GCC OR (USE_CLANG AND NOT MSVC_CLANG))
# !!! FIXME: do we _need_ to mess with CMAKE_C_FLAGS here? if(CMAKE_VERSION VERSION_LESS 3.12)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter \"${SDL3_SOURCE_DIR}/src/video/khronos\"") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter \"${SDL3_SOURCE_DIR}/src/video/khronos\"")
else()
target_compile_options(sdl-global-options INTERFACE "SHELL:-idirafter \"${SDL3_SOURCE_DIR}/src/video/khronos\"")
endif()
else() else()
target_include_directories(sdl-build-options INTERFACE "${SDL3_SOURCE_DIR}/src/video/khronos") target_include_directories(sdl-global-options INTERFACE "${SDL3_SOURCE_DIR}/src/video/khronos")
endif() endif()
# All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so # All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so

10
cmake/macros.cmake
View File

@ -78,10 +78,15 @@ function(listtostr LIST OUTPUT)
# Do not use string(REPLACE ";" " ") here to avoid messing up list entries # Do not use string(REPLACE ";" " ") here to avoid messing up list entries
set(res) set(res)
foreach(ITEM ${${LIST}}) foreach(ITEM ${${LIST}})
string(SUBSTRING "${ITEM}" 0 6 start)
if(start STREQUAL "SHELL:")
string(SUBSTRING "${ITEM}" 6 -1 ITEM)
endif()
if(ITEM) if(ITEM)
set(res "${res} ${LPREFIX}${ITEM}") set(res "${res} ${LPREFIX}${ITEM}")
endif() endif()
endforeach() endforeach()
string(STRIP "${res}" res)
set(${OUTPUT} "${res}" PARENT_SCOPE) set(${OUTPUT} "${res}" PARENT_SCOPE)
endfunction() endfunction()
@ -96,8 +101,13 @@ function(listtostrrev _LIST _OUTPUT)
# entries # entries
set(res) set(res)
foreach(_ITEM ${${_LIST}}) foreach(_ITEM ${${_LIST}})
string(SUBSTRING "${_ITEM}" 0 6 start)
if(start STREQUAL "SHELL:")
string(SUBSTRING "${_ITEM}" 6 -1 _ITEM)
endif()
set(res "${res} ${_LPREFIX}${_ITEM}") set(res "${res} ${_LPREFIX}${_ITEM}")
endforeach() endforeach()
string(STRIP "${res}" res)
set($_OUTPUT} "${res}" PARENT_SCOPE) set($_OUTPUT} "${res}" PARENT_SCOPE)
endfunction() endfunction()