Skip to content
Snippets Groups Projects
Commit e0cf0cdf authored by Nicky's avatar Nicky
Browse files

Switch to target_include_directories

All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
parent 6d0bba9c
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Showing
with 26 additions and 26 deletions
......@@ -40,4 +40,4 @@ else (WINDOWS)
rt
)
endif (WINDOWS)
set_target_include_dirs( ll::apr ${LIBS_PREBUILT_DIR}/include/apr-1 )
target_include_directories( ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1 )
......@@ -5,7 +5,7 @@ include_guard()
create_target(ll::vorbis)
use_prebuilt_binary(ogg_vorbis)
set_target_include_dirs( ll::vorbis ${LIBS_PREBUILT_DIR}/include )
target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
if (WINDOWS)
target_link_libraries(ll::vorbis INTERFACE ogg_static vorbis_static vorbisenc_static vorbisfile_static )
......
......@@ -3,13 +3,13 @@ include(Linking)
include(Prebuilt)
include_guard()
create_target( cef::cef )
create_target( ll::cef )
use_prebuilt_binary(dullahan)
set_target_include_dirs( cef::cef ${LIBS_PREBUILT_DIR}/include/cef)
target_include_directories( ll::cef SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/cef)
if (WINDOWS)
target_link_libraries( cef::cef INTERFACE
target_link_libraries( ll::cef INTERFACE
libcef.lib
libcef_dll_wrapper.lib
dullahan.lib
......@@ -25,7 +25,7 @@ elseif (DARWIN)
message(FATAL_ERROR "CEF not found")
endif()
target_link_libraries( cef::cef INTERFACE
target_link_libraries( ll::cef INTERFACE
${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
${APPKIT_LIBRARY}
......
......@@ -10,4 +10,4 @@ if (WINDOWS)
else (WINDOWS)
target_link_libraries(ll::libcurl INTERFACE libcurl.a)
endif (WINDOWS)
set_target_include_dirs( ll::libcurl ${LIBS_PREBUILT_DIR}/include)
target_include_directories( ll::libcurl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
......@@ -16,4 +16,4 @@ else (WINDOWS)
set(EXPAT_COPY libexpat.so.1 libexpat.so)
endif ()
endif (WINDOWS)
set_target_include_dirs( ll::expat ${LIBS_PREBUILT_DIR}/include )
target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
......@@ -23,8 +23,8 @@ if (USE_FMODSTUDIO)
if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
# If the path have been specified in the arguments, use that
target_link_libraries(fmodstudio::fmodstudio INTERFACE ${FMODSTUDIO_LIBRARY})
set_target_include_dirs(fmodstudio::fmodstudio ${FMODSTUDIO_INCLUDE_DIR})
target_link_libraries(ll::fmodstudio INTERFACE ${FMODSTUDIO_LIBRARY})
target_include_directories( ll::fmodstudio SYSTEM INTERFACE ${FMODSTUDIO_INCLUDE_DIR})
else (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
# If not, we're going to try to get the package listed in autobuild.xml
# Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL)
......@@ -40,7 +40,7 @@ if (USE_FMODSTUDIO)
target_link_libraries( ll::fmodstudio INTERFACE fmod)
endif (WINDOWS)
set_target_include_dirs(ll::fmodstudio ${LIBS_PREBUILT_DIR}/include/fmodstudio)
target_include_directories( ll::fmodstudio SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/fmodstudio)
endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
else()
set( USE_FMODSTUDIO "OFF")
......
......@@ -5,6 +5,6 @@ include_guard()
create_target( ll::freetype)
use_prebuilt_binary(freetype)
set_target_include_dirs( ll::freetype ${LIBS_PREBUILT_DIR}/include/freetype2/)
target_include_directories( ll::freetype SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/freetype2/)
target_link_libraries( ll::freetype INTERFACE freetype )
......@@ -6,6 +6,6 @@ create_target( ll::glod )
use_prebuilt_binary(glod)
set_target_include_dirs( ll::glod ${LIBS_PREBUILT_DIR}/include)
target_include_directories( ll::glod SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
target_link_libraries( ll::glod INTERFACE GLOD )
target_compile_definitions( ll::glod INTERFACE LL_GLOD=1)
\ No newline at end of file
......@@ -7,7 +7,7 @@ include_guard()
use_prebuilt_binary(googlemock)
create_target( ll::googlemock )
set_target_include_dirs( ll::googlemock
target_include_directories( ll::googlemock SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include
)
......@@ -16,7 +16,7 @@ if (LINUX)
target_link_libraries( ll::googlemock INTERFACE gmock gtest)
elseif(WINDOWS)
target_link_libraries( ll::googlemock INTERFACE gmock)
set_target_include_dirs( ll::googlemock
target_include_directories( ll::googlemock SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include
${LIBS_PREBUILT_DIR}/include/gmock)
elseif(DARWIN)
......
......@@ -12,5 +12,5 @@ elseif(DARWIN)
elseif(LINUX)
target_link_libraries( ll::hunspell INTERFACE hunspell-1.3)
endif()
set_target_include_dirs( ll::hunspell ${LIBS_PREBUILT_DIR}/include/hunspell)
target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell)
use_prebuilt_binary(dictionaries)
......@@ -14,4 +14,4 @@ elseif (DARWIN)
elseif (WINDOWS)
target_link_libraries( ll::jpeglib INTERFACE jpeglib)
endif (LINUX)
set_target_include_dirs( ll::jpeglib ${LIBS_PREBUILT_DIR}/include)
target_include_directories( ll::jpeglib SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
......@@ -12,4 +12,4 @@ elseif (DARWIN)
elseif (LINUX)
target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-4.1.3_libmt.a )
endif (WINDOWS)
set_target_include_dirs( ll::jsoncpp ${LIBS_PREBUILT_DIR}/include/json)
target_include_directories( ll::jsoncpp SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/json)
......@@ -19,7 +19,7 @@ if (USE_KDU)
target_link_libraries( ll::kdu INTERFACE libkdu.a)
endif (WINDOWS)
set_target_include_dirs( ll::kdu
target_include_directories( ll::kdu SYSTEM INTERFACE
${AUTOBUILD_INSTALL_DIR}/include/kdu
${LIBS_OPEN_DIR}/llkdu
)
......
......@@ -32,4 +32,4 @@ else (HAVOK)
target_link_libraries( llphysicsextensions INTERFACE llphysicsextensionsstub)
endif (HAVOK)
set_target_include_dirs(llphysicsextensions ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
target_include_directories( llphysicsextensions INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
......@@ -29,7 +29,7 @@ else()
endif()
create_target( ll::colladadom )
set_target_include_dirs( ll::colladadom
target_include_directories( ll::colladadom SYSTEM INTERFACE
${LIBS_PREBUILT_DIR}/include/collada
${LIBS_PREBUILT_DIR}/include/collada/1.4
)
......
......@@ -9,7 +9,7 @@ create_target(ll::sdl)
if (LINUX)
use_prebuilt_binary(SDL)
set_target_include_dirs( ll::sdl ${LIBS_PREBUILT_DIR}/i686-linux)
target_include_directories( ll::sdl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/i686-linux)
target_link_libraries( ll::sdl INTERFACE SDL directfb fusion direct X11)
target_compile_definitions( ll::sdl INTERFACE LL_SDL=1)
endif (LINUX)
......
......@@ -12,4 +12,4 @@ elseif (DARWIN)
else (WINDOWS)
target_link_libraries( ll::nghttp2 INTERFACE libnghttp2.a )
endif (WINDOWS)
set_target_include_dirs( ll::nghttp2 ${LIBS_PREBUILT_DIR}/include/nghttp2)
target_include_directories( ll::nghttp2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/nghttp2)
......@@ -13,7 +13,7 @@ endif()
if (USE_OPENAL)
create_target( ll::openal )
set_target_include_dirs( ll::openal "${LIBS_PREBUILT_DIR}/include/AL")
target_include_directories( ll::openal SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/AL")
target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
use_prebuilt_binary(openal)
......
......@@ -7,4 +7,4 @@ create_target( ll::openjpeg )
use_prebuilt_binary(openjpeg)
target_link_libraries(ll::openjpeg INTERFACE openjpeg )
set_target_include_dirs( ll::openjpeg ${LIBS_PREBUILT_DIR}/include/openjpeg)
target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/openjpeg)
......@@ -12,5 +12,5 @@ elseif (LINUX)
else()
target_link_libraries(ll::openssl INTERFACE ssl crypto)
endif (WINDOWS)
set_target_include_dirs(ll::openssl ${LIBS_PREBUILT_DIR}/include)
target_include_directories( ll::openssl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment