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
7d01a9e8
Unverified
Commit
7d01a9e8
authored
5 years ago
by
Niels Lohmann
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into installfix
parents
aa06a476
b3da8b32
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
CMakeLists.txt
CMakeLists.txt
+2
-1
No files found.
CMakeLists.txt
View file @
7d01a9e8
...
@@ -40,6 +40,7 @@ set(NLOHMANN_JSON_CMAKE_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
...
@@ -40,6 +40,7 @@ set(NLOHMANN_JSON_CMAKE_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
set
(
NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
ConfigVersion.cmake"
)
set
(
NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
ConfigVersion.cmake"
)
set
(
NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
Config.cmake"
)
set
(
NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
Config.cmake"
)
set
(
NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
Targets.cmake"
)
set
(
NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE
"
${
NLOHMANN_JSON_CMAKE_CONFIG_DIR
}
/
${
PROJECT_NAME
}
Targets.cmake"
)
set
(
NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
if
(
JSON_MultipleHeaders
)
if
(
JSON_MultipleHeaders
)
set
(
NLOHMANN_JSON_INCLUDE_BUILD_DIR
"
${
PROJECT_SOURCE_DIR
}
/include/"
)
set
(
NLOHMANN_JSON_INCLUDE_BUILD_DIR
"
${
PROJECT_SOURCE_DIR
}
/include/"
)
...
@@ -158,6 +159,6 @@ endif()
...
@@ -158,6 +159,6 @@ endif()
)
)
install
(
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PROJECT_NAME
}
.pc"
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PROJECT_NAME
}
.pc"
DESTINATION
lib/pkgconfig
DESTINATION
${
NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR
}
)
)
endif
()
endif
()
This diff is collapsed.
Click to expand it.
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