diff options
| author | Didier Raboud <odyx@debian.org> | 2013-01-02 14:23:17 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-01-02 14:35:46 +0100 |
| commit | ffb4d9ff4fbee5c96ff7828044e9002d85843b6a (patch) | |
| tree | ccba79e41ecea5d34e0d7185959d99d500d38f27 | |
| parent | 16d97f91212c1b1b4cd775ab9808afb66b648267 (diff) | |
| download | colobot-ffb4d9ff4fbee5c96ff7828044e9002d85843b6a.tar.gz colobot-ffb4d9ff4fbee5c96ff7828044e9002d85843b6a.tar.bz2 colobot-ffb4d9ff4fbee5c96ff7828044e9002d85843b6a.zip | |
Let CMake rely on data's CMakeLists.txt if it exists
- Also update data to latest 'dev', where the CMakeLists exists
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| m--------- | data | 0 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fbdd7cc..8640832 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/data b/data -Subproject 6b6e5a0ab56bf42f17d969c1bd4c09185605cad +Subproject 5a991a77eb5f476d29b4d4f976be48fdf74a053 |