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

Jump to bottom

fix: CMake package and pkgconfig rework #916

Merged
merged 26 commits into from
Sep 15, 2023
Merged

fix: CMake package and pkgconfig rework #916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
80356ae
add tests of the CMake package and pkgconfig
phlptp Aug 15, 2023
c3cec5f
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 15, 2023
bac5352
remove extraneous option
phlptp Aug 15, 2023
bf484d6
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 15, 2023
6b5dba4
tweak the workflows
phlptp Aug 15, 2023
70f3e84
add in addition find paths
phlptp Aug 15, 2023
0d0c043
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 15, 2023
1312011
tweak the directory lists
phlptp Aug 15, 2023
f9a2158
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 15, 2023
f88fa6e
update the package_config_tests
phlptp Aug 15, 2023
796c283
install package config to correct location
phlptp Aug 15, 2023
89a9232
add debug output to cmake
phlptp Aug 15, 2023
eab3fd2
reorder cmake calls
phlptp Aug 15, 2023
39142e7
try again
phlptp Aug 15, 2023
fb9a268
add precompiled package tests
phlptp Aug 15, 2023
4aacecf
fix incorrect cmake variable in install section
phlptp Aug 17, 2023
5bb3c90
add preconfig files for precompiled library
phlptp Aug 17, 2023
7f32799
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 17, 2023
cedfc7c
filter the ctest workflow
phlptp Aug 17, 2023
ff96dc2
fix the template file condition
phlptp Aug 17, 2023
7453e29
add single file install test
phlptp Aug 17, 2023
b1199a5
add a header for single file include so it has a CLI/CLI.hpp file jus…
phlptp Aug 17, 2023
1ccc25f
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 17, 2023
81974a5
fix configure location
phlptp Aug 17, 2023
757f0e0
style: pre-commit.ci fixes
pre-commit-ci[bot] Aug 17, 2023
1cb7547
simplify to single pc file for single_file and normal
phlptp Aug 18, 2023
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
Prev Previous commit
Next Next commit
style: pre-commit.ci fixes
  • Loading branch information
@pre-commit-ci @phlptp
pre-commit-ci[bot] authored and phlptp committed Aug 18, 2023
commit 757f0e0ce4662890c95b6ac412263420a3dfd63c
2 changes: 1 addition & 1 deletion cmake/CLIsingle.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
#pragma once

//single file header
#include <cli11.hpp>
#include "../CLI11.hpp"
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ if(CLI11_SINGLE_FILE)
if(CLI11_INSTALL)
install(FILES "${PROJECT_BINARY_DIR}/include/CLI11.hpp"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
configure_file("${CLI11_SOURCE_DIR}/cmake/CLIsingle.hpp.in" "${PROJECT_BINARY_DIR}/include/CLI/CLI.hpp" @ONLY)
configure_file("${CLI11_SOURCE_DIR}/cmake/CLIsingle.hpp.in"
"${PROJECT_BINARY_DIR}/include/CLI/CLI.hpp" @ONLY)
install(FILES "${PROJECT_BINARY_DIR}/include/CLI/CLI.hpp"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CLI)
endif()
Expand Down