Only add bundled inc dirs, when using bundled libs

Fixes #1881

src/CMakeLists.txt

@@ -612,10 +612,21 @@ list(APPEND SM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
             "${SM_SRC_DIR}/generated")
 list(APPEND SM_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}")
 if(NOT APPLE)
-  list(APPEND SM_INCLUDE_DIRS
-              "${SM_EXTERN_DIR}/glew-1.5.8/include"
-              "${SM_EXTERN_DIR}/jsoncpp/include"
-              "${SM_EXTERN_DIR}/zlib")
+  if(NOT WITH_SYSTEM_GLEW)
+    list(APPEND SM_INCLUDE_DIRS
+                "${SM_EXTERN_DIR}/glew-1.5.8/include")
+  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(WITH_OGG)
       list(APPEND SM_INCLUDE_DIRS
@@ -625,7 +636,7 @@ if(NOT APPLE)
     endif()
     list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/ffmpeg/include")
   else()
-    if(WITH_OGG)
+    if(WITH_OGG AND NOT WITH_SYSTEM_OGG)
       list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/vorbis")
     endif()
     if(HAS_FFMPEG)
@@ -664,7 +675,7 @@ endif()
 if(WIN32)
   # FIXME: This makes no sense...
   #list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
-else()
+elseif(NOT WITH_SYSTEM_PNG)
   list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include")
 endif()
 

src/CMakeProject-texture.cmake

@@ -50,10 +50,18 @@ target_link_libraries("TextureFontGenerator" ${TEXTURE_LINK_LIB})
 list(APPEND TEXTURE_INCLUDE_DIRS
             "${TEXTURE_DIR}"
             "${TEXTURE_DIR}/res"
-            "${SM_EXTERN_DIR}/zlib"
-            "${SM_EXTERN_DIR}/libpng/include"
             "${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"
                            PUBLIC ${TEXTURE_INCLUDE_DIRS})