diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd2397fb..620537c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ if(PLATFORM_ANDROID)
     add_subdirectory(Android/HelloAR)
 endif()
 
-if(NOT ${DILIGENT_BUILD_SAMPLE_BASE_ONLY} AND (D3D11_SUPPORTED OR D3D12_SUPPORTED OR GL_SUPPORTED OR GLES_SUPPORTED))
+if(NOT PLATFORM_FREEBSD AND NOT ${DILIGENT_BUILD_SAMPLE_BASE_ONLY} AND (D3D11_SUPPORTED OR D3D12_SUPPORTED OR GL_SUPPORTED OR GLES_SUPPORTED))
     add_subdirectory(UnityPlugin)
 endif()
 
diff --git a/SampleBase/CMakeLists.txt b/SampleBase/CMakeLists.txt
index 94e932b7..7965a43c 100644
--- a/SampleBase/CMakeLists.txt
+++ b/SampleBase/CMakeLists.txt
@@ -190,7 +190,7 @@ elseif(PLATFORM_ANDROID)
     target_link_libraries(Diligent-SampleBase PRIVATE GLESv3 PUBLIC native_app_glue)
 elseif(PLATFORM_LINUX)
     find_package(X11 REQUIRED)
-    target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms ${OPENGL_LIBRARY} X11::X11)
+    target_link_libraries(Diligent-SampleBase PRIVATE XCBKeySyms ${OPENGL_LIBRARY} ${X11_LIBRARIES})
 elseif(PLATFORM_MACOS OR PLATFORM_IOS)
 
 endif()