Cmake fixes

Author: electricbrass

client/CMakeLists.txt

@@ -67,8 +67,6 @@ if(UNIX AND NOT APPLE)
   find_package(Fontconfig)
   if(Fontconfig_FOUND)
     add_definitions(-DFONTCONFIG)
-    include_directories(${Fontconfig_INCLUDE_DIRS})
-    link_libraries(${Fontconfig_LIBRARIES})
   endif()
 endif()
 
@@ -244,6 +242,11 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
     if(X11_FOUND)
       target_link_libraries(odamex X11)
     endif()
+    if(Fontconfig_FOUND)
+      target_include_directories(odamex ${Fontconfig_INCLUDE_DIRS})
+      target_link_libraries(odamex ${Fontconfig_LIBRARIES})
+      target_compile_options(odamex PRIVATE ${Fontconfig_COMPILE_OPTIONS})
+    endif()
   endif()
 
   odamex_copy_libs(odamex)

client/gui/gui_common.cpp

@@ -67,8 +67,8 @@ Fl_Image* GUIRes::icon_odamex_128()
 
 #else
 
-bool LOAD_FONT() { return false; }
-void UNLOAD_FONT() {}
+bool LOAD_FONT(const char*) { return false; }
+void UNLOAD_FONT(const char*) {}
 
 #endif