From c6ce1d8c674e8e20ca285a097be1fd975e911c62 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Sun, 4 Nov 2012 16:51:07 +0100 Subject: [PATCH] Fix adding ShivaVG include directory --- CMakeLists.txt | 1 + simgear/canvas/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39dfab99..25f73047 100644 --- 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 169c2d65..2110c9e1 100644 --- 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}") -- 2.39.5