Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
191aa0fd
Unverified
Commit
191aa0fd
authored
Mar 28, 2019
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔧
overworked maintaner targets
parent
d79c1680
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
CMakeLists.txt
CMakeLists.txt
+2
-3
Makefile
Makefile
+0
-0
CMakeLists.txt
test/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
191aa0fd
...
@@ -23,8 +23,7 @@ option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF)
...
@@ -23,8 +23,7 @@ option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF)
## CONFIGURATION
## CONFIGURATION
##
##
set
(
NLOHMANN_JSON_TARGET_NAME
${
PROJECT_NAME
}
)
set
(
NLOHMANN_JSON_TARGET_NAME
${
PROJECT_NAME
}
)
set
(
NLOHMANN_JSON_CONFIG_INSTALL_DIR
"lib/cmake/
${
PROJECT_NAME
}
"
set
(
NLOHMANN_JSON_CONFIG_INSTALL_DIR
"lib/cmake/
${
PROJECT_NAME
}
"
CACHE INTERNAL
""
)
CACHE INTERNAL
""
)
set
(
NLOHMANN_JSON_INCLUDE_INSTALL_DIR
"include"
)
set
(
NLOHMANN_JSON_INCLUDE_INSTALL_DIR
"include"
)
set
(
NLOHMANN_JSON_TARGETS_EXPORT_NAME
"
${
PROJECT_NAME
}
Targets"
)
set
(
NLOHMANN_JSON_TARGETS_EXPORT_NAME
"
${
PROJECT_NAME
}
Targets"
)
set
(
NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE
"cmake/config.cmake.in"
)
set
(
NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE
"cmake/config.cmake.in"
)
...
@@ -47,7 +46,7 @@ endif()
...
@@ -47,7 +46,7 @@ endif()
##
##
add_library
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE
)
add_library
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE
)
add_library
(
${
PROJECT_NAME
}
::
${
NLOHMANN_JSON_TARGET_NAME
}
ALIAS
${
NLOHMANN_JSON_TARGET_NAME
}
)
add_library
(
${
PROJECT_NAME
}
::
${
NLOHMANN_JSON_TARGET_NAME
}
ALIAS
${
NLOHMANN_JSON_TARGET_NAME
}
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.8.0"
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.8.0"
)
target_compile_features
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE cxx_range_for
)
target_compile_features
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE cxx_range_for
)
else
()
else
()
target_compile_features
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE cxx_std_11
)
target_compile_features
(
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE cxx_std_11
)
...
...
Makefile
View file @
191aa0fd
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
View file @
191aa0fd
...
@@ -6,7 +6,7 @@ option(JSON_Coverage "Build test suite with coverage information" OFF)
...
@@ -6,7 +6,7 @@ option(JSON_Coverage "Build test suite with coverage information" OFF)
if
(
JSON_Sanitizer
)
if
(
JSON_Sanitizer
)
message
(
STATUS
"Building test suite with Clang sanitizer"
)
message
(
STATUS
"Building test suite with Clang sanitizer"
)
if
(
NOT MSVC
)
if
(
NOT MSVC
)
set
(
CMAKE_CXX_FLAGS
"-g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
)
set
(
CMAKE_CXX_FLAGS
"-g -O2 -fsanitize=address -fsanitize=undefined -f
sanitize=implicit-conversion -fsanitize=integer -fsanitize=nullability -f
no-omit-frame-pointer"
)
endif
()
endif
()
endif
()
endif
()
...
@@ -64,7 +64,7 @@ set_target_properties(catch_main PROPERTIES
...
@@ -64,7 +64,7 @@ set_target_properties(catch_main PROPERTIES
COMPILE_DEFINITIONS
"$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
COMPILE_DEFINITIONS
"$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
COMPILE_OPTIONS
"$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>"
COMPILE_OPTIONS
"$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>"
)
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.8.0"
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.8.0"
)
target_compile_features
(
catch_main PUBLIC cxx_range_for
)
target_compile_features
(
catch_main PUBLIC cxx_range_for
)
else
()
else
()
target_compile_features
(
catch_main PUBLIC cxx_std_11
)
target_compile_features
(
catch_main PUBLIC cxx_std_11
)
...
...
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