From 3c1e29db9ff7dc2edbbdf11435a5925f83954ac5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Mar 2018 16:51:03 +0000 Subject: [PATCH] Moved OPENGL_INCLUDE_DIR include into it's own INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) entry to help with FreeBSD builds where a previous rev of the OSG has already been installed --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf1b3eb5f..19fb4d489 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,16 +330,15 @@ IF(UNIX AND NOT ANDROID) ENDIF() -INCLUDE_DIRECTORIES( - ${OpenSceneGraph_SOURCE_DIR}/include - ${OPENGL_INCLUDE_DIR} -) +INCLUDE_DIRECTORIES(${OpenSceneGraph_SOURCE_DIR}/include/) # Make the headers visible to everything IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include) ENDIF() +INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) + # Common global definitions #ADD_DEFINITIONS(-D) # Platform specific definitions