From b1daa6a693cd40bc4e565916f4964f9902d99d96 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 10 May 2018 18:50:17 +0100 Subject: [PATCH] Changed the ordering of the build include directory and the source include directory to avoid build issues on systems where a different version of the OSG has been built in-source then another built out-of-source resulting in conflicts --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b53b68068..dee66efdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,13 +330,14 @@ IF(UNIX AND NOT ANDROID) ENDIF() -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(${OpenSceneGraph_SOURCE_DIR}/include/) + INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) # Common global definitions