diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-04-02 16:50:24 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-04-02 16:52:41 +0100 |
| commit | c08aaa86d1ada72ad6e185837f9c179693b60c22 (patch) | |
| tree | 28f7a8ba882942eb8622e6f08e43aef97df5946d /CMakeLists.txt | |
| parent | 87a8af0ad71a11c248ba94c9ba20668dcb0fe831 (diff) | |
Sync the build system directory names with the core.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 52f983079..0b22650cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,8 +256,8 @@ endif() if(NOT BIN_DIR) set(BIN_DIR "bin") endif() -if(NOT DB_DIR) - set(DB_DIR "data") +if(NOT DATA_DIR) + set(DATA_DIR "data") endif() if(NOT DOC_DIR) set(DOC_DIR "doc") @@ -265,14 +265,14 @@ endif() if(NOT CONF_DIR) set(CONF_DIR "conf") endif() -if(NOT LIB_DIR) - set(LIB_DIR "lib") +if(NOT MODULE_DIR) + set(MODULE_DIR "modules") endif() if(NOT LOCALE_DIR) set(LOCALE_DIR "locale") endif() -if(NOT LOGS_DIR) - set(LOGS_DIR "logs") +if(NOT LOG_DIR) + set(LOG_DIR "logs") endif() # Version number processing @@ -350,15 +350,15 @@ set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>") get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME) # At install time, create the following additional directories -install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") -install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") +install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/backups\")") +install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOG_DIR}\")") if(WIN32) - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") + install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/runtime\")") endif() # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory if(NOT WIN32 AND RUNGROUP) - install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") - install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") + install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DATA_DIR}/backups\")") + install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOG_DIR}\")") install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")") endif() # On Windows platforms, install extra files @@ -368,7 +368,7 @@ if(WIN32) ) endif() -install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")") +install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MODULE_DIR}\")") # Only process the CPack section if we have CPack if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") |