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
8e9a8792
Commit
8e9a8792
authored
Nov 30, 2017
by
Matthias Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved natis to root dir
parent
af775ddb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
CMakeLists.txt
CMakeLists.txt
+13
-6
nlohmann_json.natvis
nlohmann_json.natvis
+0
-0
No files found.
CMakeLists.txt
View file @
8e9a8792
...
@@ -36,15 +36,15 @@ target_include_directories(
...
@@ -36,15 +36,15 @@ target_include_directories(
INTERFACE $<INSTALL_INTERFACE:include/>
INTERFACE $<INSTALL_INTERFACE:include/>
)
)
##
## add debug view defintion file for msvc (natvis) [cmake <= 3.2.2 does not support export of source files]
## add debug view defintion file for msvc
##
if
(
MSVC AND CMAKE_VERSION VERSION_GREATER
"3.2.2"
)
if
(
MSVC AND CMAKE_VERSION VERSION_GREATER
"3.2.2"
)
set
(
NLOHMANN_ADD_NATVIS TRUE
)
set
(
NLOHMANN_NATVIS_FILE
"nlohmann_json.natvis"
)
target_sources
(
target_sources
(
${
NLOHMANN_JSON_TARGET_NAME
}
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE
INTERFACE
$<INSTALL_INTERFACE:
include/json.natvis
>
$<INSTALL_INTERFACE:
${
NLOHMANN_NATVIS_FILE
}
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_
JSON_SOURCE_DIR
}
/json.natvis
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_
NATVIS_FILE
}
>
)
)
endif
()
endif
()
...
@@ -79,6 +79,12 @@ install(
...
@@ -79,6 +79,12 @@ install(
FILES
${
NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE
}
${
NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE
}
FILES
${
NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE
}
${
NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE
}
DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
)
)
if
(
NLOHMANN_ADD_NATVIS
)
install
(
FILES
${
NLOHMANN_NATVIS_FILE
}
DESTINATION .
)
endif
()
install
(
install
(
TARGETS
${
NLOHMANN_JSON_TARGET_NAME
}
TARGETS
${
NLOHMANN_JSON_TARGET_NAME
}
EXPORT
${
NLOHMANN_JSON_TARGETS_EXPORT_NAME
}
EXPORT
${
NLOHMANN_JSON_TARGETS_EXPORT_NAME
}
...
@@ -87,4 +93,4 @@ install(
...
@@ -87,4 +93,4 @@ install(
install
(
install
(
EXPORT
${
NLOHMANN_JSON_TARGETS_EXPORT_NAME
}
EXPORT
${
NLOHMANN_JSON_TARGETS_EXPORT_NAME
}
DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
)
)
\ No newline at end of file
src/
json.natvis
→
nlohmann_
json.natvis
View file @
8e9a8792
File moved
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