Fix adding ShivaVG include directory

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39dfab99bf448617b9fd805c265d61ebd3ac35ba..25f73047b68145d1cdfbb25ee31ee3e034c5b209 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -286,6 +286,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
 
 include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
 include_directories(${PROJECT_BINARY_DIR}/simgear)
 include_directories(${PROJECT_BINARY_DIR}/simgear/xml)
 

diff --git a/simgear/canvas/CMakeLists.txt b/simgear/canvas/CMakeLists.txt
index 169c2d6520d8f8ed446ff97437b05bb040aa0c99..2110c9e155b1dc2cf6a9f99b4def0363ba5b55fc 100644 (file)
--- a/simgear/canvas/CMakeLists.txt
+++ b/simgear/canvas/CMakeLists.txt
@@ -19,7 +19,6 @@ set(SOURCES
 )
 
 add_subdirectory(ShivaVG/src)
-include_directories(ShivaVG/include)
-
 add_subdirectory(elements)
+
 simgear_scene_component(canvas canvas "${SOURCES}" "${HEADERS}")