small modification

This commit is contained in:
Lendemor 2016-03-16 14:03:42 +01:00
parent fa12432926
commit 1c22d7833d
4 changed files with 33 additions and 4 deletions

3
.gitignore vendored
View File

@ -3,4 +3,5 @@ test/CMakeFiles/*
cmake_install.cmake
Makefile
CMakeCache.txt
*.user
build-*

20
CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
project(TestTemplate)
cmake_minimum_required(VERSION 2.8)
include(ExternalProject)
ExternalProject_Add(
sparrow_input
PREFIX ${PROJECT_SOURCE_DIR}/..
GIT_REPOSITORY Lendemor:lum1ere%40@https://git.epicsparrow.com/epicsparrow/SparrowInput.git
)
EXTERNALProject_get_property(sparrow_input install_dir)
MESSAGE(STATUS ${install_dir})
add_library(sparrow_input)
include(template.cmake)

View File

@ -68,7 +68,6 @@ else()
message(WARNING "NO SOURCE FILE PROVIDED")
endif()
add_definitions(-std=c++11)
#find libraries
@ -123,6 +122,7 @@ if(USE_INPUT)
set(USE_SFML True)
LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowinput/src)
LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../SparrowInput/src)
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
endif()
@ -176,7 +176,12 @@ if(USE_SFML)
)
endif()
LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_DEPENDENCIES}) # order is VERY important
LIST(APPEND LIB_DEPENDENCIES_LIST
${SFML_LIBRARY_WINDOW}
${SFML_LIBRARY_GRAPHICS}
${SFML_LIBRARY_SYSTEM}
${SFML_LIBRARY_AUDIO}
${SFML_DEPENDENCIES}) # order is VERY important
endif()
if(USE_BULLET)

View File

@ -4,3 +4,6 @@
include(test.cmake)
cmake_minimum_required(VERSION 2.8)
include(../template.cmake)