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
1a521cbd
Unverified
Commit
1a521cbd
authored
Jul 14, 2020
by
Niels Lohmann
Committed by
GitHub
Jul 14, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile
Makefile: Always use SED variable
parents
8921e5e5
88adffda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
Makefile
Makefile
+4
-4
No files found.
Makefile
View file @
1a521cbd
...
...
@@ -562,7 +562,7 @@ check-amalgamation:
check-single-includes
:
@
for
x
in
$(SRCS)
;
do
\
echo
"Checking self-sufficiency of
$$
x..."
;
\
echo
"#include <
$$
x>
\n
int main() {}
\n
"
|
sed
's|include/||'
>
single_include_test.cpp
;
\
echo
"#include <
$$
x>
\n
int main() {}
\n
"
|
$(SED)
's|include/||'
>
single_include_test.cpp
;
\
$(CXX)
$(CXXFLAGS)
-Iinclude
-std
=
c++11 single_include_test.cpp
-o
single_include_test
;
\
rm
-f
single_include_test.cpp single_include_test
;
\
done
...
...
@@ -572,7 +572,7 @@ check-single-includes:
# CMake
##########################################################################
# grep "^option" CMakeLists.txt test/CMakeLists.txt |
sed
's/(/ /' | awk '{print $2}' | xargs
# grep "^option" CMakeLists.txt test/CMakeLists.txt |
$(SED)
's/(/ /' | awk '{print $2}' | xargs
# check if all flags of our CMake files work
check_cmake_flags_do
:
...
...
@@ -651,6 +651,6 @@ clean:
update_hedley
:
rm
-f
include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h
-o
include/nlohmann/thirdparty/hedley/hedley.hpp
gsed
-i
's/HEDLEY_/JSON_HEDLEY_/g'
include/nlohmann/thirdparty/hedley/hedley.hpp
grep
"[[:blank:]]*#[[:blank:]]*undef"
include/nlohmann/thirdparty/hedley/hedley.hpp |
grep
-v
"__"
|
sort
|
uniq
|
gsed
's/ //g'
| gsed
's/undef/undef /g'
>
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(SED)
-i
's/HEDLEY_/JSON_HEDLEY_/g'
include/nlohmann/thirdparty/hedley/hedley.hpp
grep
"[[:blank:]]*#[[:blank:]]*undef"
include/nlohmann/thirdparty/hedley/hedley.hpp |
grep
-v
"__"
|
sort
|
uniq
|
$(SED)
's/ //g'
|
$(SED)
's/undef/undef /g'
>
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(MAKE)
amalgamate
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