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

Port from master to RB-2.1 - Fix install paths regressions (#1502) #1510

Merged
merged 5 commits into from
Oct 19, 2021
Merged

Port from master to RB-2.1 - Fix install paths regressions (#1502) #1510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a1e2ce
Fix install paths regressions (#1502)
remia Oct 4, 2021
85273bb
Merge branch 'RB-2.1' into adsk_contrib/change_version_21_8
hodoulp Oct 6, 2021
1869572
Merge branch 'RB-2.1' into adsk_contrib/change_version_21_8
remia Oct 6, 2021
cdc3a87
Merge branch 'RB-2.1' into adsk_contrib/change_version_21_8
hodoulp Oct 7, 2021
f726c3f
Merge branch 'RB-2.1' into adsk_contrib/change_version_21_8
hodoulp Oct 18, 2021
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ include (CTest)
enable_testing()


###############################################################################
# Provides install directory variables as defined by the GNU Coding Standards.
include(GNUInstallDirs)


###############################################################################
# Forbid in-source build.

Expand Down
4 changes: 2 additions & 2 deletions share/cmake/utils/CompilerFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ if (UNIX AND NOT CMAKE_SKIP_RPATH)
# (i.e. a binary loading a dynamic library) and then from the current directory
# (i.e. dynamic library loading another dynamic library).
if (APPLE)
set(CMAKE_INSTALL_RPATH "@loader_path/../lib;@loader_path")
set(CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
else()
set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib;$ORIGIN")
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR};$ORIGIN")
endif()
endif()
2 changes: 0 additions & 2 deletions src/OpenColorIO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ if(NOT WIN32)

# Install the pkg-config file.

include(GNUInstallDirs)

set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
Expand Down