From f32e78f06bb6b2fe7896032bd7f93aba029a7e93 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 12 Mar 2015 14:40:38 +0100 Subject: [PATCH] Changing CMakeLists.txt to account for new tinyxml location. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ba59fd..fe18af0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,10 +58,14 @@ set(EXECUTABLE_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE) # source and header files FILE(GLOB SOURCE_FILES "${CMAKE_SOURCE_DIR}/*.cc") -SET(SOURCE_FILES ${SOURCE_FILES} ${SOURCE_FILES_SHARED}) +FILE(GLOB SOURCE_FILES_TINYXML "${CMAKE_SOURCE_DIR}/extern/tinyxml/*.cc") +SET(SOURCE_FILES ${SOURCE_FILES} ${SOURCE_FILES_TINYXML}) FILE(GLOB HEADER_FILES "${CMAKE_SOURCE_DIR}/*.hh") -SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_SHARED}) +FILE(GLOB HEADER_FILES_TINYXML "${CMAKE_SOURCE_DIR}/extern/tinyxml/*.hh") +SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_TINYXML}) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/tinyxml) # shader files FILE(GLOB_RECURSE SHADER_FILES "${CMAKE_SOURCE_DIR}/Shader/*.*")