small modification
This commit is contained in:
parent
fa12432926
commit
1c22d7833d
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,4 +3,5 @@ test/CMakeFiles/*
|
|||||||
cmake_install.cmake
|
cmake_install.cmake
|
||||||
Makefile
|
Makefile
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
|
*.user
|
||||||
|
build-*
|
||||||
|
20
CMakeLists.txt
Normal file
20
CMakeLists.txt
Normal 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)
|
||||||
|
|
||||||
|
|
@ -68,7 +68,6 @@ else()
|
|||||||
message(WARNING "NO SOURCE FILE PROVIDED")
|
message(WARNING "NO SOURCE FILE PROVIDED")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
add_definitions(-std=c++11)
|
add_definitions(-std=c++11)
|
||||||
|
|
||||||
#find libraries
|
#find libraries
|
||||||
@ -123,6 +122,7 @@ if(USE_INPUT)
|
|||||||
set(USE_SFML True)
|
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 INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../SparrowInput/src)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -176,7 +176,12 @@ if(USE_SFML)
|
|||||||
)
|
)
|
||||||
endif()
|
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()
|
endif()
|
||||||
|
|
||||||
if(USE_BULLET)
|
if(USE_BULLET)
|
||||||
|
@ -4,3 +4,6 @@
|
|||||||
include(test.cmake)
|
include(test.cmake)
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
|
include(../template.cmake)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user