Skip to content

build: use GNUInstallDirs for install paths #58

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

Merged
LimiNode merged 2 commits into from
Sep 8, 2025
Merged

build: use GNUInstallDirs for install paths #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e2e54
build(cmake): use GNUInstallDirs for install paths
LimiNode Sep 8, 2025
b305562
build(vcpkg): detect install libdir
LimiNode Sep 8, 2025
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
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.14)
project(obfy VERSION 1.0.0 LANGUAGES CXX)

include(GNUInstallDirs)

add_library(obfy INTERFACE)
target_include_directories(obfy INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down Expand Up @@ -61,17 +63,17 @@ write_basic_package_version_file(
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/obfyConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/obfyConfig.cmake"
INSTALL_DESTINATION lib/cmake/obfy
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/obfy
)

install(EXPORT obfyTargets
FILE obfyTargets.cmake
NAMESPACE obfy::
DESTINATION lib/cmake/obfy
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/obfy
)

install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/obfyConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/obfyConfigVersion.cmake"
DESTINATION lib/cmake/obfy
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/obfy
)
11 changes: 9 additions & 2 deletions vcpkg-port/obfy/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/obfy)
vcpkg_cmake_get_vars(cmake_vars_file)
include(${cmake_vars_file})

if(NOT VCPKG_TARGET_CMAKE_INSTALL_LIBDIR)
set(VCPKG_TARGET_CMAKE_INSTALL_LIBDIR lib)
endif()

vcpkg_cmake_config_fixup(CONFIG_PATH "${VCPKG_TARGET_CMAKE_INSTALL_LIBDIR}/cmake/obfy")

vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/../../LICENSE")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/${VCPKG_TARGET_CMAKE_INSTALL_LIBDIR}")

5 changes: 3 additions & 2 deletions vcpkg-port/obfy/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
"homepage": "https://github.com/NewYaroslav/obfy",
"license": "MIT",
"dependencies": [
"vcpkg-cmake",
"vcpkg-cmake-config"
{ "name": "vcpkg-cmake", "host": true },
{ "name": "vcpkg-cmake-config", "host": true },
{ "name": "vcpkg-cmake-get-vars", "host": true }
]
}

Loading