diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 8c98adaedce4300062c4571c47ff7217a01701f4..7856812f94cd83d5a9ae680194dec0c317ae3877 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Disable all warnings
+IF(COMPILER_IS_CLANG OR COMPILER_IS_GCC)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+ELSEIF(MSVC)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
+ENDIF()
+
 # Add logog subdirectory and group its targets in a Visual Studio folder
 ADD_SUBDIRECTORY(logog)
 IF(BUILD_TESTING)
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index fd812388df8fef7cf3d9a3189310acd25a05ccfa..b76da2f9d1cafee12551b92739a7c939036f7316 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -50,7 +50,7 @@ IF(COMPILER_IS_CLANG)
 	IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.3")
 		MESSAGE(FATAL_ERROR "Aborting: Clang 3.3 is required! Found version ${CMAKE_CXX_COMPILER_VERSION}")
 	ENDIF()
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -isystem ${CMAKE_SOURCE_DIR}/ThirdParty/ -Weverything -Wno-c++98-compat-pedantic")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Weverything -Wno-c++98-compat-pedantic")
 ENDIF() # COMPILER_IS_CLANG
 
 ### Intel compiler