Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RMG-Core: Fix GNUInstallDirs usage #226

Merged
merged 1 commit into from
Jan 28, 2024
Merged

RMG-Core: Fix GNUInstallDirs usage #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/RMG-Core/Config.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#ifndef PORTABLE_INSTALL
#define CORE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define CORE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}"
#define CORE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}"
#define CORE_INSTALL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
#define CORE_INSTALL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}"
#endif // PORTABLE_INSTALL

#endif // CORE_CONFIG_HPP
8 changes: 2 additions & 6 deletions Source/RMG-Core/Directories.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,7 @@ std::filesystem::path CoreGetLibraryDirectory(void)
}
else
{
directory = CORE_INSTALL_PREFIX;
directory += "/";
directory += CORE_INSTALL_LIBDIR;
directory = CORE_INSTALL_LIBDIR;
directory += "/RMG";
}
#endif // PORTABLE_INSTALL
Expand Down Expand Up @@ -465,9 +463,7 @@ std::filesystem::path CoreGetSharedDataDirectory(void)
}
else
{
directory = CORE_INSTALL_PREFIX;
directory += "/";
directory += CORE_INSTALL_DATADIR;
directory = CORE_INSTALL_DATADIR;
directory += "/RMG";
}
#endif // PORTABLE_INSTALL
Expand Down