diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 5da5458..459ed5a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -64,18 +64,22 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
+
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+
+if(FORTIFY_FOUND EQUAL -1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+endif()
         
 set(SOURCE_FILES
         ubl-settings-kernel.c
         ubl-settings-kernel.h
         ubl-strings.h
-        )
+)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
@@ -85,7 +89,8 @@ set(LIBRARIES
         pthread
         ublsettings
         ublsettings-gtk3
-        ublsettingsui-gtk3)
+        ublsettingsui-gtk3
+)
 
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})