diff --git a/.travis.yml b/.travis.yml
index 55f50db..158a37d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq cmake libsdl2-dev libsdl2-image-dev g++-4.8
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-script: cmake . -DRUN_GUI_TESTS=OFF -DCMAKE_INSTALL_PREFIX=`pwd`/_prefix && make && make test && make install
+script: cmake . -DRUN_GUI_TESTS=OFF -DCMAKE_INSTALL_PREFIX=`pwd`/_prefix -DSDL2PP_WITH_WERROR=YES && make && make test && make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6da54a..c23d01e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 # there are functions present on wiki, but not yet in stable SDL2 releases;
 # we hide these under following options
 OPTION(SDL2PP_NEW_2_0_4 "Enable new SDL2 functions present since SDL2 2.0.4" OFF)
+OPTION(SDL2PP_WITH_WERROR "Make warnings fatal" OFF)
 
 IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 	OPTION(SDL2PP_WITH_IMAGE "Enable SDL2_image support" ON)
@@ -39,6 +40,10 @@ ENDIF(MSVC)
 INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${SDL2_ALL_INCLUDE_DIRS})
 
+IF(SDL2PP_WITH_WERROR)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAG}")
+ENDIF(SDL2PP_WITH_WERROR)
+
 # config.h
 CONFIGURE_FILE(
 	SDL2pp/Config.hh.in
@@ -82,8 +87,6 @@ SET(LIBRARY_HEADERS
 IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 	MESSAGE(STATUS "libSDL2pp standalone build")
 
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAG}")
-
 	# library
 	ADD_LIBRARY(SDL2pp SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
 	TARGET_LINK_LIBRARIES(SDL2pp ${SDL2_ALL_LIBRARIES})