diff --git a/Source/CMake/BsEngineConfig.h.in b/Source/CMake/BsEngineConfig.h.in index 301aaf73f..db89006bf 100644 --- a/Source/CMake/BsEngineConfig.h.in +++ b/Source/CMake/BsEngineConfig.h.in @@ -7,18 +7,9 @@ #define BS_SCRIPTING_ENABLED @BS_SCRIPTING_ENABLED@ /** Path to the framework source directory. */ -static constexpr const char* RAW_APP_ROOT = "@APP_ROOT_DIR@/"; +static constexpr const char* RAW_APP_ROOT = "@CMAKE_INSTALL_PREFIX@/share/bsf/"; /** Path to the framework build directory. */ static constexpr const char* BUILD_APP_ROOT = "@PROJECT_BINARY_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 a35dc9bea..87831df61 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -220,8 +220,8 @@ endif() ## Install install( - DIRECTORY ../Data - DESTINATION bin/ + DIRECTORY ../Data/ + DESTINATION share/bsf/ PATTERN "../Data/Raw" EXCLUDE PATTERN ".version" EXCLUDE PATTERN ".reqversion" EXCLUDE