Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
548f4889
Unverified
Commit
548f4889
authored
Feb 10, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
overworked Makefile
parent
865ff00d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
CMakeLists.txt
CMakeLists.txt
+2
-0
Makefile
Makefile
+12
-1
No files found.
CMakeLists.txt
View file @
548f4889
...
...
@@ -32,8 +32,10 @@ set(NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/$
if
(
JSON_MultipleHeaders
)
set
(
NLOHMANN_JSON_INCLUDE_BUILD_DIR
"
${
PROJECT_SOURCE_DIR
}
/include/"
)
message
(
STATUS
"Using the multi-header code from
${
NLOHMANN_JSON_INCLUDE_BUILD_DIR
}
"
)
else
()
set
(
NLOHMANN_JSON_INCLUDE_BUILD_DIR
"
${
PROJECT_SOURCE_DIR
}
/single_include/"
)
message
(
STATUS
"Using the single-header code from
${
NLOHMANN_JSON_INCLUDE_BUILD_DIR
}
"
)
endif
()
##
...
...
Makefile
View file @
548f4889
...
...
@@ -50,6 +50,7 @@ all:
@
echo
"pedantic_clang - run Clang with maximal warning flags"
@
echo
"pedantic_gcc - run GCC with maximal warning flags"
@
echo
"pretty - beautify code with Artistic Style"
@
echo
"run_benchmarks - build and run benchmarks"
##########################################################################
# unit tests
...
...
@@ -70,7 +71,7 @@ check-fast:
clean
:
rm
-fr
json_unit json_benchmarks fuzz fuzz-testing
*
.dSYM
test
/
*
.dSYM
rm
-fr
benchmarks/files/numbers/
*
.json
rm
-fr
build_coverage
rm
-fr
build_coverage
build_benchmarks
$(MAKE)
clean
-Cdoc
$(MAKE)
clean
-Ctest
...
...
@@ -188,6 +189,16 @@ pedantic_gcc:
-Wuseless-cast
\
-Wvariadic-macros"
##########################################################################
# benchmarks
##########################################################################
run_benchmarks
:
mkdir
build_benchmarks
cd
build_benchmarks
;
cmake ../benchmarks
cd
build_benchmarks
;
make
cd
build_benchmarks
;
./json_benchmarks
##########################################################################
# fuzzing
##########################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment