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

make ARCH_INDEPENDENT libraries to have CMake configs installed to share #42

Merged
merged 10 commits into from
Sep 2, 2024
Merged

make ARCH_INDEPENDENT libraries to have CMake configs installed to share #42

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f9872d
make ARCH_INDEPENDENT libraries to have CMake configs installed to share
Arniiiii Aug 20, 2024
84b59e5
add test
Arniiiii Aug 21, 2024
61aba0f
micro fix of test for header_only
Arniiiii Aug 21, 2024
1e1edb2
Update .gitignore
Arniiiii Aug 25, 2024
d86e151
maybe fix CI
Arniiiii Aug 25, 2024
5a8101e
fix formatting
Arniiiii Aug 25, 2024
f0b8613
fix formatting.
Arniiiii Aug 26, 2024
c238aa6
maybe fix tests
Arniiiii Aug 26, 2024
028acfd
place comment to the end of command, not as separate command.
Arniiiii Aug 26, 2024
8c5fb16
check for cmake config in /usr/local/share, not /usr/share
Arniiiii Aug 26, 2024
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: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,10 @@ function(packageProject)
endif()
endif()

set(INSTALL_DIR_FOR_CMAKE_CONFIGS ${CMAKE_INSTALL_LIBDIR})
if(PROJECT_ARCH_INDEPENDENT)
set(wbpvf_extra_args ARCH_INDEPENDENT)
set(INSTALL_DIR_FOR_CMAKE_CONFIGS ${CMAKE_INSTALL_DATADIR}) # share
endif()
Arniiiii marked this conversation as resolved.
Show resolved Hide resolved

write_basic_package_version_file(
Expand All @@ -141,7 +143,7 @@ function(packageProject)
)

set("${PROJECT_NAME}_INSTALL_CMAKEDIR"
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}${PROJECT_VERSION_SUFFIX}"
"${INSTALL_DIR_FOR_CMAKE_CONFIGS}/cmake/${PROJECT_NAME}${PROJECT_VERSION_SUFFIX}"
CACHE PATH "CMake package config location relative to the install prefix"
)

Expand Down
Loading