diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-09-07 20:28:47 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2022-09-10 18:28:34 +0300 |
| commit | 703af920d8c296cdd0e0567f66d8c3e6b58521ad (patch) | |
| tree | 5e2f8c3872250b469a30a7c7e28c4bbf632f7baf /src/mumble | |
| parent | 077c58453b5085a721c97845bdeb85bb48a02d77 (diff) | |
BUILD(cmake): Always keep absolute install paths around
Previously we would define our install paths as relative paths when
using the packaging option and turning them into absolute paths
otherwise.
While relative paths are required for CPack to work properly, we use
the paths e.g. for passing them in via macros and there we absolutely
require the full, absolute paths to be passed.
Thus, this commit removed the discrepancy of the results when built with
packagin=ON vs packagin=OFF and now always defines the install paths as
relative paths. However, we now keep an additional set of paths around
that are now always absolute.
Diffstat (limited to 'src/mumble')
| -rw-r--r-- | src/mumble/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 95754e69c..abe2820d0 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -389,8 +389,8 @@ target_link_libraries(mumble mumble_client_object_lib) target_compile_definitions(mumble_client_object_lib PUBLIC - "MUMBLE_LIBRARY_PATH=${MUMBLE_INSTALL_LIBDIR}" - "MUMBLE_PLUGIN_PATH=${MUMBLE_INSTALL_PLUGINDIR}" + "MUMBLE_LIBRARY_PATH=${MUMBLE_INSTALL_ABS_LIBDIR}" + "MUMBLE_PLUGIN_PATH=${MUMBLE_INSTALL_ABS_PLUGINDIR}" ) set_target_properties(mumble PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |