diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52c5214..4f76cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING INTERNAL FORCE)
 
 project(libwebrtc)
 
-option(GN_EXTRA_ARGS "Extra 'gn gen' arguments to pass when configuring WebRTC" "")
-option(NINJA_ARGS "Ninja arguments to pass when compiling WebRTC" "")
+set(GN_EXTRA_ARGS "" CACHE STRING "Extra 'gn gen' arguments to pass when configuring WebRTC")
+set(NINJA_ARGS "" CACHE STRING "Ninja arguments to pass when compiling WebRTC")
 option(BUILD_DEB_PACKAGE "Build .deb package" OFF)
 
 # Allow the use of IN_LIST operand
diff --git a/cmake/AddWebRTCTarget.cmake b/cmake/AddWebRTCTarget.cmake
index bb40bc4..4370d23 100644
--- a/cmake/AddWebRTCTarget.cmake
+++ b/cmake/AddWebRTCTarget.cmake
@@ -4,12 +4,15 @@ function(add_webrtc_target SOURCE_DIR BUILD_DIR)
 
 	if (MSVC)
 		set(GEN_ARGS_COMMON "${GEN_ARGS_COMMON} is_clang=false use_lld=false")
-		set(GEN_ARGS_DEBUG "${GEN_ARGS_DEBUG} enable_iterator_debugging=true")
 	endif ()
 
 	set(GEN_ARGS_DEBUG "${GEN_ARGS_COMMON} is_debug=true")
 	set(GEN_ARGS_RELEASE "${GEN_ARGS_COMMON} is_debug=false")
 
+	if (MSVC)
+		set(GEN_ARGS_DEBUG "${GEN_ARGS_DEBUG} enable_iterator_debugging=true")
+	endif ()
+
 	if (WIN32)
 		set(GN_EXECUTABLE gn.bat)
 	else ()
@@ -60,10 +63,10 @@ function(add_webrtc_target SOURCE_DIR BUILD_DIR)
 	add_custom_target(webrtc-build ALL)
 	add_custom_target(webrtc-clean)
 	if (CMAKE_GENERATOR MATCHES "Visual Studio")
-		add_custom_command_with_path(webrtc-build ninja -C "${BUILD_DIR}/$<CONFIG>" :webrtc jsoncpp libyuv)
+		add_custom_command_with_path(webrtc-build ninja -C "${BUILD_DIR}/$<CONFIG>" :webrtc jsoncpp libyuv ${NINJA_ARGS})
 		add_custom_command_with_path(webrtc-clean ${GN_EXECUTABLE} clean "${BUILD_DIR}/$<CONFIG>")
 	else ()
-		add_custom_command_with_path(webrtc-build ninja -C "${BUILD_DIR}" :webrtc jsoncpp libyuv)
+		add_custom_command_with_path(webrtc-build ninja -C "${BUILD_DIR}" :webrtc jsoncpp libyuv ${NINJA_ARGS})
 		add_custom_command_with_path(webrtc-clean ${GN_EXECUTABLE} clean "${BUILD_DIR}")
 	endif ()