Skip to content

Use CMAKE_INSTALL_FULL_LIBDIR in compat cmake files#3067

Merged
arcady-lunarg merged 1 commit intoKhronosGroup:mainfrom
chuangzhu:cmake-install-full-libdir
May 2, 2023
Merged

Use CMAKE_INSTALL_FULL_LIBDIR in compat cmake files#3067
arcady-lunarg merged 1 commit intoKhronosGroup:mainfrom
chuangzhu:cmake-install-full-libdir

Conversation

@chuangzhu
Copy link
Copy Markdown
Contributor

According to
https://cmake.org/cmake/help/v3.25/module/GNUInstallDirs.html, CMAKE_INSTALL_LIBDIR can be an absolute path. For instance, Nixpkgs defined it to an absolute path in /nix/store. The output in this case is:

# result-glslang/lib/cmake/glslangTargets.cmake:5
include("${CMAKE_CURRENT_LIST_DIR}/../..//nix/store/3mif2zibig0cilk5dbz334278n0vlq9s-glslang-1.3.231.0/lib/glslang/glslang-targets.cmake")

Signed-off-by: Chuang Zhu git@chuang.cz

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Nov 19, 2022

CLA assistant check
All committers have signed the CLA.

@jeremy-lunarg jeremy-lunarg added the kokoro:run Trigger Google bot runs label Nov 29, 2022
@kokoro-team kokoro-team removed the kokoro:run Trigger Google bot runs label Nov 29, 2022
According to
https://cmake.org/cmake/help/v3.25/module/GNUInstallDirs.html,
CMAKE_INSTALL_LIBDIR can be an absolute path. For instance, Nixpkgs
[defined it to an absolute path in /nix/store](https://github.com/NixOS/nixpkgs/blob/3d17b4c305cefef284109fa9d426b00f3e5072c6/pkgs/development/tools/build-managers/cmake/setup-hook.sh#L101).
The output in this case is:

	# result-glslang/lib/cmake/glslangTargets.cmake:5
	include("${CMAKE_CURRENT_LIST_DIR}/../..//nix/store/3mif2zibig0cilk5dbz334278n0vlq9s-glslang-1.3.231.0/lib/glslang/glslang-targets.cmake")

Signed-off-by: Chuang Zhu <git@chuang.cz>
@arcady-lunarg arcady-lunarg force-pushed the cmake-install-full-libdir branch from 7627bd8 to 8fbdbf7 Compare May 2, 2023 21:18
@arcady-lunarg arcady-lunarg self-requested a review May 2, 2023 21:32
@arcady-lunarg arcady-lunarg added the kokoro:run Trigger Google bot runs label May 2, 2023
@kokoro-team kokoro-team removed the kokoro:run Trigger Google bot runs label May 2, 2023
Copy link
Copy Markdown
Contributor

@arcady-lunarg arcady-lunarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the PR.

@arcady-lunarg arcady-lunarg merged commit dfc9774 into KhronosGroup:main May 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants