From 222a596754b4b999fa372a5de4775c4591263798 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 7 Jun 2013 10:59:40 -0700 Subject: [PATCH 1/2] remove unnecessary OctalCode include in main --- interface/src/main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 8894e5bd7c..3137ca644d 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -18,8 +18,6 @@ #include "Application.h" #include "Log.h" -#include - int main(int argc, const char * argv[]) { timeval startup_time; gettimeofday(&startup_time, NULL); From c3915ed0784ba0d5a1ff87aed84f6c51f6e39242 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 7 Jun 2013 11:34:01 -0700 Subject: [PATCH 2/2] use system flag for external library includes --- interface/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index b2984b35bb..83a827b184 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -87,13 +87,19 @@ find_package(GLM REQUIRED) find_package(LodePNG REQUIRED) find_package(LibOVR) -# include headers for external libraries and InterfaceConfig. +# include headers for interface and InterfaceConfig. include_directories( ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/includes - ${GLM_INCLUDE_DIRS} - ${LODEPNG_INCLUDE_DIRS} - ${LIBOVR_INCLUDE_DIRS} +) + +# include external library headers +# use system flag so warnings are supressed +include_directories( + SYSTEM + ${GLM_INCLUDE_DIRS} + ${LODEPNG_INCLUDE_DIRS} + ${LIBOVR_INCLUDE_DIRS} ) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES})