diff options
| author | Guillaume Meunier | 2018-11-22 23:30:26 +0100 |
|---|---|---|
| committer | Guillaume Meunier | 2018-11-23 21:45:02 +0100 |
| commit | bde77e13790ba63db9c9650bc856ea9ec7758392 (patch) | |
| tree | d61c04a7a230e6bcc93410a96dab51ba0e63f333 /install-dir.patch | |
| download | aur-bde77e13790ba63db9c9650bc856ea9ec7758392.tar.gz | |
First commit
Diffstat (limited to 'install-dir.patch')
| -rw-r--r-- | install-dir.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/install-dir.patch b/install-dir.patch new file mode 100644 index 000000000000..e3af1871453e --- /dev/null +++ b/install-dir.patch @@ -0,0 +1,40 @@ +diff --git a/Source/CMake/BsEngineConfig.h.in b/Source/CMake/BsEngineConfig.h.in +index 01a7db342..ff99fdedd 100644 +--- a/Source/CMake/BsEngineConfig.h.in ++++ b/Source/CMake/BsEngineConfig.h.in +@@ -6,18 +6,9 @@ + #define BS_PHYSICS_MODULE "@PHYSICS_MODULE_LIB@" + + /** Path to the framework root when files haven't been packaged yet (e.g. running from debugger). */ +-static constexpr const char* RAW_APP_ROOT = "@APP_ROOT_DIR@/"; ++static constexpr const char* RAW_APP_ROOT = "@CMAKE_INSTALL_PREFIX@/share/bsf/"; + + /** Secondary search path to use when looking for built-in assets (after the RAW_APP_ROOT). */ + static constexpr const char* SECONDARY_APP_ROOT = "@SECONDARY_APP_ROOT_DIR@/"; + +-/** Path to the binaries when files haven't been packaged yet (e.g. running from debugger). */ +-#if BS_CONFIG == BS_CONFIG_DEBUG +-static constexpr const char* BINARIES_PATH = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG@"; +-#elif BS_CONFIG == BS_CONFIG_RELWITHDEBINFO +-static constexpr const char* BINARIES_PATH = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO@"; +-#elif BS_CONFIG == BS_CONFIG_MINSIZEREL +-static constexpr const char* BINARIES_PATH = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL@"; +-#elif BS_CONFIG == BS_CONFIG_RELEASE +-static constexpr const char* BINARIES_PATH = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE@"; +-#endif ++static constexpr const char* BINARIES_PATH = "@CMAKE_INSTALL_PREFIX@/lib/"; +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 02ba71c5a..ebaac189c 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -193,8 +193,8 @@ check_and_update_builtin_assets(bsfCompiled ${BSF_SOURCE_DIR}/../Data Data ${COM + + ## Install + install( +- DIRECTORY ../Data +- DESTINATION bin/ ++ DIRECTORY ../Data/ ++ DESTINATION share/bsf/ + PATTERN "../Data/Raw" EXCLUDE + PATTERN ".version" EXCLUDE + PATTERN ".reqversion" EXCLUDE |