diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/app/app.cpp | 3 | ||||
| -rw-r--r-- | src/common/config.h.cmake | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d072fd0..5238c1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,5 +162,6 @@ endif() # Subdirectory with sources add_subdirectory(src bin) -# TODO: provide data files as git submodule and setup correct data path -install_files(/share/games/colobot ../data) +# TODO: provide data files as git submodule +set(COLOBOT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/games/colobot CACHE PATH "Colobot shared data directory") +install(DIRECTORY ../data DESTINATION ${COLOBOT_DATA_DIR}) diff --git a/src/app/app.cpp b/src/app/app.cpp index 79c0e13..04f8d2a 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -15,6 +15,7 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +#include "common/config.h" #include "app/app.h" @@ -130,7 +131,7 @@ CApplication::CApplication() m_mouseButtonsState = 0; m_trackedKeys = 0; - m_dataPath = "./data"; + m_dataPath = CBOT_DEFAULT_DATADIR; m_language = LANGUAGE_ENV; diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index f76a780..23b6de8 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -8,4 +8,5 @@ #cmakedefine USE_GLEW @USE_GLEW@ #cmakedefine GLEW_STATIC +#define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@" #define CBOT_I18N_DIR "@CMAKE_INSTALL_PREFIX@/share/locale/" |