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
1729db85
Commit
1729db85
authored
Sep 26, 2018
by
Chuck Atkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fix package config to deal with versioning and namespaces
parent
e184b6ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
CMakeLists.txt
CMakeLists.txt
+2
-3
cmake/config.cmake.in
cmake/config.cmake.in
+10
-4
No files found.
CMakeLists.txt
View file @
1729db85
...
...
@@ -86,10 +86,10 @@ include(CMakePackageConfigHelpers)
write_basic_package_version_file
(
${
NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE
}
COMPATIBILITY SameMajorVersion
)
configure_
package_config_
file
(
configure_file
(
${
NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE
}
${
NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE
}
INSTALL_DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
@ONLY
)
install
(
...
...
@@ -121,4 +121,3 @@ install(
NAMESPACE
${
PROJECT_NAME
}
::
DESTINATION
${
NLOHMANN_JSON_CONFIG_INSTALL_DIR
}
)
export
(
PACKAGE
${
PROJECT_NAME
}
)
\ No newline at end of file
cmake/config.cmake.in
View file @
1729db85
@PACKAGE_INIT@
include(FindPackageHandleStandardArgs)
set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG ${CMAKE_CURRENT_LIST_FILE})
find_package_handle_standard_args(@PROJECT_NAME@ CONFIG_MODE)
if(NOT TARGET @PROJECT_NAME@::@NLOHMANN_JSON_TARGET_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@NLOHMANN_JSON_TARGETS_EXPORT_NAME@.cmake")
if((NOT TARGET @NLOHMANN_JSON_TARGET_NAME@) AND
(PACKAGE_FIND_VERSION VERSION_LESS 3.2.0))
add_library(@NLOHMANN_JSON_TARGET_NAME@ ALIAS @PROJECT_NAME@::@NLOHMANN_JSON_TARGET_NAME@)
(NOT @PROJECT_NAME@_FIND_VERSION OR
@PROJECT_NAME@_FIND_VERSION VERSION_LESS 3.2.0))
add_library(@NLOHMANN_JSON_TARGET_NAME@ INTERFACE IMPORTED)
set_target_properties(@NLOHMANN_JSON_TARGET_NAME@ PROPERTIES
INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@NLOHMANN_JSON_TARGET_NAME@
)
endif()
endif()
check_required_components("@PROJECT_NAME@")
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