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
83b14338
Unverified
Commit
83b14338
authored
Apr 07, 2018
by
Niels Lohmann
Committed by
GitHub
Apr 07, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
CMake: 3.8+ is Sufficient
parents
495436a5
e439a1a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
CMakeLists.txt
+3
-3
No files found.
CMakeLists.txt
View file @
83b14338
...
@@ -53,8 +53,8 @@ target_include_directories(
...
@@ -53,8 +53,8 @@ target_include_directories(
$<INSTALL_INTERFACE:include>
$<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 (natvis)
if
(
MSVC
AND CMAKE_VERSION VERSION_GREATER
"3.2.2"
)
if
(
MSVC
)
set
(
NLOHMANN_ADD_NATVIS TRUE
)
set
(
NLOHMANN_ADD_NATVIS TRUE
)
set
(
NLOHMANN_NATVIS_FILE
"nlohmann_json.natvis"
)
set
(
NLOHMANN_NATVIS_FILE
"nlohmann_json.natvis"
)
target_sources
(
target_sources
(
...
@@ -64,7 +64,7 @@ if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2")
...
@@ -64,7 +64,7 @@ if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2")
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_NATVIS_FILE
}
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_NATVIS_FILE
}
>
)
)
endif
()
endif
()
##
##
## TESTS
## TESTS
## create and configure the unit test target
## create and configure the unit test target
...
...
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