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

json nlohmann include subfolder #429

Merged
merged 2 commits into from
Aug 18, 2024
Merged

json nlohmann include subfolder #429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe91f21
json nlohmann include subfolder
danoli3 Aug 18, 2024
03f6ef2
json folders
danoli3 Aug 18, 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
8 changes: 4 additions & 4 deletions apothecary/formulas/json.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ function build() {
# executed inside the lib src dir, first arg $1 is the dest libs dir root
function copy() {
# headers
mkdir -p $1/include
cp -v single_include/nlohmann/json.hpp $1/include
mkdir -p $1/include/nlohmann
cp -v single_include/nlohmann/json.hpp $1/include/nlohmann/json.hpp

. "$SECURE_SCRIPT"
secure $1/include/json.hpp json.pkl
secure $1/include/nlohmann/json.hpp json.pkl

# copy license file
if [ -d "$1/license" ]; then
Expand All @@ -76,7 +76,7 @@ function clean() {

function load() {
. "$LOAD_SCRIPT"
LOAD_RESULT=$(loadsave ${TYPE} "json" ${ARCH} ${VER} "$LIBS_DIR_REAL/$1/include" ${PLATFORM} )
LOAD_RESULT=$(loadsave ${TYPE} "json" ${ARCH} ${VER} "$LIBS_DIR_REAL/$1/include/nlohmann" ${PLATFORM} )
PREBUILT=$(echo "$LOAD_RESULT" | tail -n 1)
if [ "$PREBUILT" -eq 1 ]; then
echo 1
Expand Down
Loading