Let CMake rely on data's CMakeLists.txt if it exists
- Also update data to latest 'dev', where the CMakeLists existsdev-ui
parent
16d97f9121
commit
ffb4d9ff4f
|
@ -223,10 +223,13 @@ add_subdirectory(src bin)
|
|||
# Installation
|
||||
##
|
||||
|
||||
file(GLOB DATA_FILES "data/*")
|
||||
|
||||
# Data
|
||||
install(DIRECTORY data/ DESTINATION ${COLOBOT_INSTALL_DATA_DIR})
|
||||
# Data: check if the submodule handles its own installation
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/data/CMakeLists.txt")
|
||||
message(STATUS "Data directory will install itself.")
|
||||
add_subdirectory(data)
|
||||
else()
|
||||
message(WARNING "Data directory is not available; make sure colobot-data is installed in ${COLOBOT_INSTALL_DATA_DIR}.")
|
||||
endif()
|
||||
|
||||
# Documentation
|
||||
if(INSTALL_DOCS AND DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND)
|
||||
|
|
2
data
2
data
|
@ -1 +1 @@
|
|||
Subproject commit 6b6e5a0ab56bf42f17d969c1bd4c09185605cad6
|
||||
Subproject commit 5a991a77eb5f476d29b4d4f976be48fdf74a053f
|
Loading…
Reference in New Issue