diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8474022..905f067 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,10 @@ if (GST_FOUND)
 
     option(QGC_GST_MICROHARD_ENABLED "Enable microhard" OFF)
     option(QGC_GST_TAISYNC_ENABLED "Enable taisyng" OFF)
+else()
+	if (QGC_GST_MICROHARD_ENABLED OR QGC_GST_TAISYNC_ENABLED)
+		message(FATAL_ERROR "You tried to enable Microhard or Taisync but gstreamer is not found. Make sure to set PKG_CONFIG_EXECUTABLE and/or PKG_CONFIG_PATH properly.")
+	endif()
 endif()
 
 add_definitions(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66681c9..af07bf7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -193,8 +193,14 @@ target_link_libraries(qgc
 )
 
 if(GST_FOUND)
-	target_link_libraries(qgc PUBLIC Microhard)
-	target_link_libraries(qgc PUBLIC Taisync)
+	if (${QGC_GST_MICROHARD_ENABLED})
+		target_compile_definitions(qgc PUBLIC QGC_GST_MICROHARD_ENABLED)
+		target_link_libraries(qgc PUBLIC Microhard)
+	endif()
+	if (${QGC_GST_TAISYNC_ENABLED})
+		target_compile_definitions(qgc PUBLIC QGC_GST_TAISYNC_ENABLED)
+		target_link_libraries(qgc PUBLIC Taisync)
+	endif()
 endif()
 
 if(BUILD_TESTING)