actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Only add bundled inc dirs, when using bundled libs

Browse Source 
Fixes #1881
This commit is contained in:
Martin Kröning
2020-06-18 22:36:02 +02:00
committed by Martin Kröning
parent 3023bb90d1
commit 960c57c4f3
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+17 -6
View File
@@ -612,10 +612,21 @@ list(APPEND SM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
"${SM_SRC_DIR}/generated") "${SM_SRC_DIR}/generated")
list(APPEND SM_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}") list(APPEND SM_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}")
if(NOT APPLE) if(NOT APPLE)
list(APPEND SM_INCLUDE_DIRS if(NOT WITH_SYSTEM_GLEW)
"${SM_EXTERN_DIR}/glew-1.5.8/include" list(APPEND SM_INCLUDE_DIRS
"${SM_EXTERN_DIR}/jsoncpp/include" "${SM_EXTERN_DIR}/glew-1.5.8/include")
"${SM_EXTERN_DIR}/zlib") endif()
if(NOT WITH_SYSTEM_JSONCPP)
list(APPEND SM_INCLUDE_DIRS
"${SM_EXTERN_DIR}/jsoncpp/include")
endif()
if(NOT WITH_SYSTEM_ZLIB)
list(APPEND SM_INCLUDE_DIRS
"${SM_EXTERN_DIR}/zlib")
endif()
if(MSVC) if(MSVC)
if(WITH_OGG) if(WITH_OGG)
list(APPEND SM_INCLUDE_DIRS list(APPEND SM_INCLUDE_DIRS
@@ -625,7 +636,7 @@ if(NOT APPLE)
endif() endif()
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/ffmpeg/include") list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/ffmpeg/include")
else() else()
if(WITH_OGG) if(WITH_OGG AND NOT WITH_SYSTEM_OGG)
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/vorbis") list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/vorbis")
endif() endif()
if(HAS_FFMPEG) if(HAS_FFMPEG)
@@ -664,7 +675,7 @@ endif()
if(WIN32) if(WIN32)
# FIXME: This makes no sense... # FIXME: This makes no sense...
#list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR}) #list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
else() elseif(NOT WITH_SYSTEM_PNG)
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include") list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include")
endif() endif()
src/CMakeProject-texture.cmake
+10 -2
View File
@@ -50,10 +50,18 @@ target_link_libraries("TextureFontGenerator" ${TEXTURE_LINK_LIB})
list(APPEND TEXTURE_INCLUDE_DIRS list(APPEND TEXTURE_INCLUDE_DIRS
"${TEXTURE_DIR}" "${TEXTURE_DIR}"
"${TEXTURE_DIR}/res" "${TEXTURE_DIR}/res"
"${SM_EXTERN_DIR}/zlib"
"${SM_EXTERN_DIR}/libpng/include"
"${SM_SRC_DIR}/generated") "${SM_SRC_DIR}/generated")
if(NOT WITH_SYSTEM_ZLIB)
list(APPEND TEXTURE_INCLUDE_DIRS
"${SM_EXTERN_DIR}/zlib")
endif()
if(NOT WITH_SYSTEM_PNG)
list(APPEND TEXTURE_INCLUDE_DIRS
"${SM_EXTERN_DIR}/libpng/include")
endif()
target_include_directories("TextureFontGenerator" target_include_directories("TextureFontGenerator"
PUBLIC ${TEXTURE_INCLUDE_DIRS}) PUBLIC ${TEXTURE_INCLUDE_DIRS})