Use variable instead of imported target for X11 dependencies

Author: lacc97

source/3rd_party/CMakeLists.txt

@@ -144,10 +144,18 @@ if(NOT WIN32)
   find_package(X11)
   if(X11_FOUND)
     target_compile_definitions(cimg INTERFACE cimg_display=1)
-    target_compile_definitions(cimg INTERFACE cimg_use_xshm cimg_use_xrandr)
-    # https://github.com/alandefreitas/matplotplusplus/issues/6
-    target_link_libraries(cimg INTERFACE ${X11_LIBRARIES} X11::Xrandr)
-    target_include_directories(cimg INTERFACE ${X11_INCLUDE_DIRS})
+    target_include_directories(cimg INTERFACE ${X11_X11_INCLUDE_PATH})
+    target_link_libraries(cimg INTERFACE ${X11_X11_LIB})
+    if(X11_XShm_FOUND)
+      target_compile_definitions(cimg INTERFACE cimg_use_xshm)
+      target_include_directories(cimg INTERFACE ${X11_XShm_INCLUDE_PATH})
+      target_link_libraries(cimg INTERFACE ${X11_Xext_LIB})
+    endif()
+    if(X11_Xrandr_FOUND)
+      target_compile_definitions(cimg INTERFACE cimg_use_xrandr)
+      target_include_directories(cimg INTERFACE ${X11_Xrandr_INCLUDE_DIR})
+      target_link_libraries(cimg INTERFACE ${X11_Xrandr_LIB})
+    endif()
   else()
     target_compile_definitions(cimg INTERFACE cimg_display=0)
   endif()