From 9dffc934fbce68eaadceb61638b7a5037b08389d Mon Sep 17 00:00:00 2001 From: Tom Gascoigne Date: Fri, 26 Oct 2012 14:57:38 +0100 Subject: [PATCH] cmake: fix build + Add missing include for project root + Move DroneConfig.{h,h.in} to include/ --- CMakeLists.txt | 7 ++++--- DroneConfig.h.in => include/DroneConfig.h.in | 0 2 files changed, 4 insertions(+), 3 deletions(-) rename DroneConfig.h.in => include/DroneConfig.h.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41b3c52..439afd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ SET(DRONE_VERSION_MAJOR 1) SET(DRONE_VERSION_MINOR 0) SET(DRONE_HEADERS include/DroneConfig.h + include/Common.h include/InputDevice.h include/Drone.h include/XBoxDevice.h @@ -35,11 +36,11 @@ SET(DRONE_SOURCES src/main.cpp SOURCE_GROUP(fireparrot FILES ${DRONE_HEADERS} ${DRONE_SOURCES}) -INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/include") +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include) CONFIGURE_FILE ( - "${PROJECT_SOURCE_DIR}/DroneConfig.h.in" - "${PROJECT_SOURCE_DIR}/DroneConfig.h" + "${PROJECT_SOURCE_DIR}/include/DroneConfig.h.in" + "${PROJECT_SOURCE_DIR}/include/DroneConfig.h" ) ADD_EXECUTABLE(fireparrot ${DRONE_SOURCES} ${DRONE_HEADERS}) diff --git a/DroneConfig.h.in b/include/DroneConfig.h.in similarity index 100% rename from DroneConfig.h.in rename to include/DroneConfig.h.in